first demo

krABMaga · Jun 2, 2024 · a3c2a2b · a3c2a2b
1 parent 2fe57d3
commit a3c2a2b
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 369 deletions.
diff --git a/gis/Cargo.toml b/gis/Cargo.toml
@@ -19,6 +19,7 @@ readme = "README.md"
 
 [dependencies]
 krabmaga = {path="/home/tirocinio/krABMaga"}
+rand = "0.8"
 
 [features]
 visualization = ["krabmaga/visualization"]

diff --git a/gis/maps/map.geojson b/gis/maps/map.geojson
@@ -5,70 +5,17 @@
       "type": "Feature",
       "properties": {},
       "geometry": {
+        "type": "Polygon",
         "coordinates": [
           [
-            5.0,
-            25.0
-          ],
-          [
-            25.0,
-            25.0
-          ]
-        ],
-        "type": "LineString"
-      }
-    },
-    {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "coordinates": [
-          [
-            25.0,
-            25.0
-          ],
-          [
-            25.0,
-            5.0
-          ]
-        ],
-        "type": "LineString"
-      }
-    },
-    {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "coordinates": [
-          [
-            25.0,
-            5.0
-          ],
-          [
-            5.0,
-            5.0
-          ]
-        ],
-        "type": "LineString"
-      }
-    },
-    {
-      "type": "Feature",
-      "properties": {},
-      "geometry": {
-        "coordinates": [
-          [
-            5.0,
-            5.0
-          ],
-          [
-            5.0,
-            25.0
+            [5.0, 25.0],
+            [25.0, 25.0],
+            [25.0, 5.0],
+            [5.0, 5.0],
+            [5.0, 25.0]
           ]
-        ],
-        "type": "LineString"
+        ]
       }
     }
-
   ]
-}
+}
diff --git a/gis/src/main.rs b/gis/src/main.rs
@@ -35,7 +35,7 @@ fn main() {
     Visualization::default()
         .with_window_dimensions(400., 400.)
         .with_simulation_dimensions(dim.0 as f32, dim.1 as f32)
-        .with_background_color(Color::NONE)
+        .with_background_color(Color::WHITE)
         .with_name("Gis")
         .start::<MapVis, Map>(MapVis, state);
 }
diff --git a/gis/src/model/map.rs b/gis/src/model/map.rs
@@ -1,10 +1,9 @@
-use super::person::Person;
+use crate::model::person::{Direction, Person};
 use krabmaga::engine::fields::dense_number_grid_2d::DenseNumberGrid2D;
 use krabmaga::engine::fields::field::Field;
 use krabmaga::engine::fields::field_2d::Field2D;
 use krabmaga::engine::location::{Int2D, Real2D};
 use krabmaga::engine::{schedule::Schedule, state::State};
-
 pub struct Map {
     pub step: u64,
     pub field: Field2D<Person>,
@@ -26,13 +25,10 @@ impl Map {
         }
     }
 
-    pub fn gis_value(&self, loc: Real2D) -> i32 {
+    pub fn gis_value(&self, loc: Int2D) -> i32 {
         return self
             .gis_field
-            .get_value(&Int2D {
-                x: loc.x as i32,
-                y: loc.y as i32,
-            })
+            .get_value(&Int2D { x: loc.x, y: loc.y })
             .unwrap();
     }
 }
@@ -72,13 +68,11 @@ impl State for Map {
     }
 
     fn set_gis(&mut self, vec: Vec<i32>, schedule: &mut Schedule) {
-        let loc = Real2D { x: 15., y: 25. };
+        let loc = Real2D { x: 10., y: 10. };
         let agent = Person {
             id: 0 as u32,
             loc,
-            dir_x: 1.0,
-            dir_y: 1.0,
-            direction: None,
+            direction: Some(Direction::Right),
         };
         self.people.push(agent.clone());
         self.field.set_object_location(agent, loc);