Fixed Map Loader issues

bdi_game/src/game/game.rs

@@ -25,8 +25,9 @@ impl<D: GameDisplay> Game<D> {
             display,
             simulation: Simulation {
                 state: WorldState {},
-                grid: WorldGrid::from_map(map),
+                grid: WorldGrid { data: vec![] }
             },
+            // grid: WorldGrid::from_height_map(map),
             input: Input {},
         }
     }

bdi_game/src/simulation/grid.rs

@@ -3,7 +3,7 @@ pub struct Grid<T>
 where
     T: Default + Clone,
 {
-    data: Vec<Vec<GridCell<T>>>,
+    pub(crate) data: Vec<Vec<GridCell<T>>>,
 }
 
 impl<T> Grid<T>
@@ -34,7 +34,7 @@ where
         &self.data[y][x]
     }
 
-    pub fn set_cell_data(&self, point: &GridPoint, data: T) {
+    pub fn set_cell_data(&mut self, point: &GridPoint, data: T) {
         let (x, y) = Self::get_cell_coord(point);
         self.data[y][x] = GridCell { data };
     }

bdi_game/src/simulation/world_grid.rs

@@ -2,7 +2,8 @@ use image::GrayImage;
 use crate::simulation::grid::{Grid, GridPoint};
 use crate::terrain_manager::sampler::Sampler2D;
 
-struct WorldCellData {
+#[derive(Default, Clone)]
+pub(crate) struct WorldCellData {
     elevation: i32,
     // ...
 }
@@ -14,10 +15,10 @@ impl WorldGrid {
     pub fn from_height_map(height_map: GrayImage) -> WorldGrid {
         let mut grid = WorldGrid::new(height_map.width() as usize);
         let mut offset: i32 = 0;
-        let map_sampler = Sampler2D::new(height_map, height_map.width() as usize);
+        let map_sampler = Sampler2D::new(height_map.clone(), height_map.width() as usize);
 
         for r in 0..height_map.height() {
-            for q in -offset..height_map.width() - offset {
+            for q in -offset..height_map.width() as i32 - offset {
                 let elevation = map_sampler.sample_hexagonal_axial(q, r as i32);
                 let point = GridPoint::new(q, r as i32);
                 grid.set_cell_data(&point, WorldCellData { elevation });
@@ -30,4 +31,5 @@ impl WorldGrid {
 
         grid
     }
-}*/
+}
+*/

bdi_game/src/terrain_manager/map.rs

@@ -1,11 +1,7 @@
 use image::GrayImage;
-use serde::{Deserialize, Serialize};
-use crate::terrain_manager::world_object::WorldObject;
 
-#[derive(Serialize, Deserialize)]
 pub struct Map {
     pub side_len: usize,
     pub height_map: GrayImage,
     pub height_modifiers: GrayImage,
-    pub objects: Vec<WorldObject>,
 }

bdi_game/src/terrain_manager/map_loader.rs

@@ -1,4 +1,4 @@
-use log::{debug, info, trace};
+use log::{debug, info};
 use image::GrayImage;
 use image::io::Reader as ImageReader;
 use crate::asset_manager::asset_manager::AssetManager;

bdi_game/src/terrain_manager/sampler.rs

@@ -17,7 +17,7 @@ impl Sampler2D {
         let scale = self.height_map.width() as f32 / self.side_len as f32;
 
         let offset_q_x = scale * q as f32;
-        let offset_q_y = 0;
+        let offset_q_y = 0f32;
 
         let offset_r_x = scale * 0.5 * r as f32;
         let offset_r_y = scale * 3.0f32.sqrt() / 2.0 * r as f32;

bdi_game/src/terrain_manager/world_object.rs

@@ -1 +0,0 @@
-pub struct WorldObject {}