fix anchor generation and UI updates

Author: ndbaker1

string-bean-cli/Cargo.toml

@@ -11,4 +11,3 @@ path = "src/main.rs"
 clap = { version = "4.3.19", features = ["derive"] }
 image = "0.24.6"
 string-bean = { path = "../string-bean" }
-line_drawing = "1.0.0"

string-bean-cli/src/main.rs

@@ -41,7 +41,7 @@ fn main() -> Result<(), std::io::Error> {
         .map(|angle| {
             (
                 x_mid as f64 + radius * angle.cos(),
-                y_mid as f64 * radius * angle.sin(),
+                y_mid as f64 + radius * angle.sin(),
             )
         })
         .collect();

string-bean-wasm/Cargo.toml

@@ -11,4 +11,3 @@ crate-type = ["cdylib"]
 [dependencies]
 string-bean = { path = "../string-bean" }
 wasm-bindgen = "0.2.87"
-line_drawing = "1.0.0"

string-bean-wasm/src/lib.rs

@@ -1,7 +1,5 @@
 use wasm_bindgen::{prelude::wasm_bindgen, JsValue};
 
-use line_drawing::XiaolinWu;
-
 #[wasm_bindgen]
 pub fn plan_as_json(
     line_count: u32,
@@ -15,12 +13,15 @@ pub fn plan_as_json(
     image_buffer: &[u8],
     start_anchor: usize,
 ) -> JsValue {
+    let (x_mid, y_mid) = (width / 2, height / 2);
+    let radius = radius.min(x_mid.min(y_mid)) as f64;
+
     let anchors: Vec<_> = (0..anchor_count)
         .map(|anchor| anchor as f64 * 2.0 * std::f64::consts::PI / anchor_count as f64)
         .map(|angle| {
             (
-                radius as f64 * (1.0 + angle.cos()),
-                radius as f64 * (1.0 + angle.sin()),
+                x_mid as f64 + radius * angle.cos(),
+                y_mid as f64 + radius * angle.sin(),
             )
         })
         .collect();
@@ -49,6 +50,7 @@ pub fn plan_as_json(
             .join(","),
     ))
 }
+
 /// https://playtechs.blogspot.com/2007/03/raytracing-on-grid.html
 fn grid_raytrace(
     x0: f64,

string-bean/src/lib.rs

@@ -109,7 +109,7 @@ where
     /// Apply changes from a line, persisting the pixel changes to the image
     fn apply_line(&mut self, src: FPos, dst: FPos) {
         for ((x, y), intensity) in self.trace_line(src, dst) {
-            self.image_mask_inverted[x + y * self.image_height] -= self.line_weight;
+            self.image_mask_inverted[x + y * self.image_height] -= intensity * self.line_weight;
         }
     }
 
@@ -126,7 +126,7 @@ where
         let line_penalty: Precision = line
             .into_iter()
             .map(|((x, y), intensity)| {
-                self.image_mask_inverted[x + y * self.image_height] - self.line_weight
+                self.image_mask_inverted[x + y * self.image_height] - intensity * self.line_weight
             })
             .map(|p| match p < 0.0 {
                 true => -self.lightness_penalty * p,