From 6fc78f924c4222efeed0b6848c7184f4fdb8b431 Mon Sep 17 00:00:00 2001
From: dani <no@email>
Date: Mon, 3 Jul 2023 14:41:34 +0000
Subject: [PATCH] haaacky pixel->coord conversion

---
 examples/assets/hex2.gif | Bin 925 -> 1001 bytes
 examples/test.rs         |  10 ++++++++--
 src/hexmap.rs            |  37 +++++++++++++++++++++++++++++++++----
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/examples/assets/hex2.gif b/examples/assets/hex2.gif
index eedd75634f38bddbbe7b319de6b501fa277a4c1b..22691251d894aa335bdf1b6349e9e8cf3a64a1f7 100644
GIT binary patch
delta 179
zcmV;k08Ia#2k8d~M@dFFIbl4p2SEdWJOCO100NkVFQLn=2csCY+DoGb$@#TO*l2~w
zhd$;+wu8x~D9pO!DyLy>-&>dS?0T(VP$wc5CC6D(={q%@1|Adx0Ztv+>oT@=TD_NQ
zSWGTz&yI1rv}UW^Z?n8neMjTxuD+6W2ZHbi7<i{a2bCz8SZKsHR0rAjqlXhBMw3QU
hDd`0R)&$D&3Cf40c{R!*(CYdMyUGen>$*_@06R83P!0e9

delta 102
zcmV-s0Ga>k2b~88M@dFFIbj~L2SEc>9sn8u00K;eFQLn=2V-({#XGCMFl)*g-Uo6c
z*_bGat)JwwNc@VleBKO@>wE9B`AWQDYG$-_l7UuIH4Fh!p`xy8y<xMiEqCSR3C85I
InNt7&I~b%av;Y7A

diff --git a/examples/test.rs b/examples/test.rs
index a70f6ac..cc5b644 100644
--- a/examples/test.rs
+++ b/examples/test.rs
@@ -25,14 +25,16 @@ impl Game for World {
             pos: Vec2::zero(),
             map: HexMap::new(
                 Vec2 { x: 27, y: 13 },
-                Tileset::load_data(include_bytes!("assets/hex2.gif"), Vec2 { x: 1, y: 1 }),
+                Tileset::load_data(include_bytes!("assets/hex2.gif"), Vec2 { x: 2, y: 1 }),
+                Vec2 { x: 23, y: 13 },
             ),
         }
     }
 
     fn update(&mut self, window_state: &mut WindowState) {
         self.pos = window_state.mouse_pos();
-        window_state.log(format!("{}x{}", self.pos.x, self.pos.y).as_str());
+        let coord = self.map.pixel_to_coord(self.pos);
+        window_state.log(format!("{}x{}", coord.x, coord.y).as_str());
     }
 
     fn on_event(&mut self, window_state: &mut WindowState, event: Event) {
@@ -40,6 +42,10 @@ impl Game for World {
             Event::MouseClick(MouseButton::Left, _) => {
                 window_state.scramble_palette();
             }
+            Event::MouseClick(MouseButton::Right, _) => {
+                self.map
+                    .set(self.map.pixel_to_coord(window_state.mouse_pos()), 1);
+            }
             _ => {}
         }
     }
diff --git a/src/hexmap.rs b/src/hexmap.rs
index 66982f4..2cd23ad 100644
--- a/src/hexmap.rs
+++ b/src/hexmap.rs
@@ -1,4 +1,5 @@
 use crate::{Image, Tileset, Vec2};
+use num::complex::ComplexFloat;
 use std::rc::Rc;
 
 //odd-q vertical layout https://www.redblobgames.com/grids/hexagons
@@ -6,15 +7,18 @@ pub struct HexMap {
     size: Vec2<i32>,
     data: Vec<i32>,
     tileset: Rc<Tileset>,
+    pix_tile_off: Vec2<i32>,
 }
 
 impl HexMap {
     //pub static
-    pub fn new(size: Vec2<i32>, tileset: Rc<Tileset>) -> Self {
+    //pix_tile_off: x offset per tile, up/down alternating y offset on x axis
+    pub fn new(size: Vec2<i32>, tileset: Rc<Tileset>, pix_tile_off: Vec2<i32>) -> Self {
         HexMap {
             size,
             data: vec![0; size.size()],
             tileset,
+            pix_tile_off,
         }
     }
 
@@ -23,6 +27,32 @@ impl HexMap {
         self.data[self.coord_to_idx(coord)]
     }
 
+    pub fn pixel_to_coord(&self, pixel: Vec2<i32>) -> Vec2<i32> {
+        let tilesize = self.tileset.tile_size();
+        let xrepeat = pixel.x % self.pix_tile_off.x;
+        let mut x = pixel.x / self.pix_tile_off.x;
+        let py = if x % 2 == 0 {
+            pixel.y
+        } else {
+            pixel.y - self.pix_tile_off.y
+        };
+        let yrepeat = py % tilesize.y;
+        let mut y = py / tilesize.y;
+        let outside = self.tileset.get(0).get_pixel(Vec2 {
+            x: xrepeat,
+            y: yrepeat,
+        }) == 0;
+        if outside {
+            x -= 1;
+            if yrepeat > tilesize.y / 2 {
+                y += 1;
+            }
+            y -= x % 2;
+        }
+        let slice = xrepeat / (tilesize.x / 4);
+        Vec2 { x, y }
+    }
+
     pub fn set(&mut self, coord: Vec2<i32>, val: i32) {
         let idx = self.coord_to_idx(coord);
         self.data[idx] = val;
@@ -39,9 +69,8 @@ impl HexMap {
         coord: Vec2<i32>,
         offset: Vec2<i32>,
     ) {
-        let x = coord.x * (self.tileset.tile_size().x as f64 * 3.0 / 4.0).ceil() as i32;
-        let y =
-            coord.y * self.tileset.tile_size().y + (coord.x % 2) * (self.tileset.tile_size().y / 2);
+        let x = coord.x * self.pix_tile_off.x;
+        let y = coord.y * self.tileset.tile_size().y + (coord.x % 2) * self.pix_tile_off.y;
         target.draw_image(
             Vec2 { x, y } + offset,
             self.tileset.get(self.data[self.coord_to_idx(coord)]),