feat: bump to bevy 18

Author: ddevin96

Cargo.toml

@@ -2,15 +2,15 @@
 resolver = "2"
 
 members = [
-    "antsforaging",
+    # "antsforaging",
     "flockers",
-    "flockers_mpi",
-    "forestfire",
-    "forestfire_bayesian",
-    "schelling",
-    "sir_ga_exploration",
-    "sugarscape",
-    "template",
+    # "flockers_mpi",
+    # "forestfire",
+    # "forestfire_bayesian",
+    # "schelling",
+    # "sir_ga_exploration",
+    # "sugarscape",
+    # "template",
     "virusnetwork",
-    "wolfsheepgrass",
+    # "wolfsheepgrass",
 ]

flockers/Cargo.toml

@@ -18,7 +18,8 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-krabmaga = "0.5.*"
+# krabmaga = "0.5.*"
+krabmaga = {path = "../../krABMaga"}
 
 [features]
 parallel = ["krabmaga/parallel"]

flockers/src/main.rs

@@ -56,7 +56,7 @@ fn main() {
     Visualization::default()
         .with_window_dimensions(1000., 700.)
         .with_simulation_dimensions(dim.0, dim.1)
-        .with_background_color(Color::rgb(0., 0., 0.))
+        .with_background_color(Color::srgb(0., 0., 0.))
         .with_name("Flockers")
         .start::<VisState, Flocker>(VisState, state);
 }

flockers/src/visualization/vis_state.rs

@@ -1,4 +1,4 @@
-use krabmaga::bevy::prelude::Commands;
+use krabmaga::bevy::prelude::{Commands, Resource};
 use krabmaga::engine::agent::Agent;
 use krabmaga::engine::location::Real2D;
 use krabmaga::engine::schedule::Schedule;
@@ -12,7 +12,6 @@ use crate::model::bird::Bird;
 use crate::model::state::Flocker;
 use crate::visualization::bird_vis::BirdVis;
 use krabmaga::bevy::ecs as bevy_ecs;
-use krabmaga::bevy::ecs::system::Resource;
 
 #[derive(Clone, Resource)]
 pub struct VisState;
@@ -43,7 +42,7 @@ impl VisualizationState<Flocker> for VisState {
 
     fn get_agent(
         &self,
-        agent_render: &Box<dyn AgentRender>,
+        agent_render: &dyn AgentRender,
         state: &Box<&dyn State>,
     ) -> Option<Box<dyn Agent>> {
         // TODO we don't just need the agent associated to the agent render, we need the correct one so that we

virusnetwork/Cargo.toml

@@ -18,7 +18,8 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-krabmaga = "0.5.*"
+# krabmaga = "0.5.*"
+krabmaga = {path = "../../krABMaga"}
 
 [features]
 visualization = ["krabmaga/visualization"]

virusnetwork/src/main.rs

@@ -47,7 +47,7 @@ fn main() {
     let mut app = Visualization::default()
         .with_window_dimensions(1000., 700.)
         .with_simulation_dimensions(dim.0, dim.1)
-        .with_background_color(Color::rgb(255., 255., 255.))
+        .with_background_color(Color::srgb(1., 1., 1.))
         .setup::<VisState, EpidemicNetworkState>(VisState, epidemic_network);
     app.add_systems(FixedUpdate, EpidemicNetworkState::render);
     app.run();

virusnetwork/src/visualization/vis_state.rs

@@ -1,8 +1,7 @@
 use crate::model::{node::*, state::EpidemicNetworkState};
 use crate::visualization::node::NetNodeVis;
 use krabmaga::bevy::ecs as bevy_ecs;
-use krabmaga::bevy::ecs::system::Resource;
-use krabmaga::bevy::prelude::Commands;
+use krabmaga::bevy::prelude::{Commands, Resource};
 use krabmaga::engine::agent::Agent;
 use krabmaga::engine::schedule::*;
 use krabmaga::engine::state::State;
@@ -39,7 +38,7 @@ impl VisualizationState<EpidemicNetworkState> for VisState {
 
     fn get_agent(
         &self,
-        agent_render: &Box<dyn AgentRender>,
+        agent_render: &dyn AgentRender,
         state: &Box<&dyn State>,
     ) -> Option<Box<dyn Agent>> {
         let state = state