From cf40d203ddf8263005f00fe5a4699109bf783924 Mon Sep 17 00:00:00 2001 From: CoCo_Sol007 Date: Sat, 9 Mar 2024 14:44:20 +0100 Subject: [PATCH 1/4] update --- crates/border-wars/src/main.rs | 7 +++++++ crates/border-wars/src/map/renderer.rs | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/crates/border-wars/src/main.rs b/crates/border-wars/src/main.rs index b02c626..201bace 100644 --- a/crates/border-wars/src/main.rs +++ b/crates/border-wars/src/main.rs @@ -4,6 +4,7 @@ use bevy::prelude::*; use border_wars::camera::CameraPlugin; use border_wars::map::renderer::RendererPlugin; use border_wars::scenes::ScenesPlugin; +use border_wars::map::generation::{StartMapGeneration, MapGenerationPlugin}; fn main() { App::new() @@ -11,5 +12,11 @@ fn main() { .add_plugins(ScenesPlugin) .add_plugins(RendererPlugin) .add_plugins(CameraPlugin) + .add_plugins(MapGenerationPlugin) + .add_systems(OnEnter(border_wars::CurrentScene::Game), start_map) .run(); } + +fn start_map(mut event: EventWriter) { + event.send(StartMapGeneration{seed:0, radius:100}); +} \ No newline at end of file diff --git a/crates/border-wars/src/map/renderer.rs b/crates/border-wars/src/map/renderer.rs index ca79ab6..cd327f8 100644 --- a/crates/border-wars/src/map/renderer.rs +++ b/crates/border-wars/src/map/renderer.rs @@ -14,7 +14,8 @@ impl Plugin for RendererPlugin { .add_systems( Update, render_map.run_if(in_state(crate::CurrentScene::Game)), - ); + ) + .insert_resource(ClearColor(Color::rgb(0.25, 0.65, 0.8))); } } -- 2.43.4 From 7b30879237d0b36429a38fd1a2e1022a70e91863 Mon Sep 17 00:00:00 2001 From: CoCo_Sol007 Date: Sat, 9 Mar 2024 15:54:26 +0100 Subject: [PATCH 2/4] change color --- crates/border-wars/src/main.rs | 2 +- crates/border-wars/src/map/renderer.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/border-wars/src/main.rs b/crates/border-wars/src/main.rs index 201bace..75da7df 100644 --- a/crates/border-wars/src/main.rs +++ b/crates/border-wars/src/main.rs @@ -18,5 +18,5 @@ fn main() { } fn start_map(mut event: EventWriter) { - event.send(StartMapGeneration{seed:0, radius:100}); + event.send(StartMapGeneration{seed:10,radius:10}); } \ No newline at end of file diff --git a/crates/border-wars/src/map/renderer.rs b/crates/border-wars/src/map/renderer.rs index cd327f8..d946f58 100644 --- a/crates/border-wars/src/map/renderer.rs +++ b/crates/border-wars/src/map/renderer.rs @@ -15,7 +15,7 @@ impl Plugin for RendererPlugin { Update, render_map.run_if(in_state(crate::CurrentScene::Game)), ) - .insert_resource(ClearColor(Color::rgb(0.25, 0.65, 0.8))); + .insert_resource(ClearColor(Color::rgb_u8(129,212,250))); } } -- 2.43.4 From bfbb45e6068ff4baef7f9cf9a3da4724c699cac1 Mon Sep 17 00:00:00 2001 From: CoCo_Sol007 Date: Sat, 9 Mar 2024 15:54:55 +0100 Subject: [PATCH 3/4] update --- crates/border-wars/src/main.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/crates/border-wars/src/main.rs b/crates/border-wars/src/main.rs index 75da7df..6194fab 100644 --- a/crates/border-wars/src/main.rs +++ b/crates/border-wars/src/main.rs @@ -4,7 +4,6 @@ use bevy::prelude::*; use border_wars::camera::CameraPlugin; use border_wars::map::renderer::RendererPlugin; use border_wars::scenes::ScenesPlugin; -use border_wars::map::generation::{StartMapGeneration, MapGenerationPlugin}; fn main() { App::new() @@ -12,11 +11,5 @@ fn main() { .add_plugins(ScenesPlugin) .add_plugins(RendererPlugin) .add_plugins(CameraPlugin) - .add_plugins(MapGenerationPlugin) - .add_systems(OnEnter(border_wars::CurrentScene::Game), start_map) .run(); -} - -fn start_map(mut event: EventWriter) { - event.send(StartMapGeneration{seed:10,radius:10}); } \ No newline at end of file -- 2.43.4 From eb883dee08065cc12b90b82d75f49b4a334cd717 Mon Sep 17 00:00:00 2001 From: CoCo_Sol007 Date: Sat, 9 Mar 2024 15:56:54 +0100 Subject: [PATCH 4/4] fix fmt --- crates/border-wars/src/main.rs | 2 +- crates/border-wars/src/map/renderer.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/border-wars/src/main.rs b/crates/border-wars/src/main.rs index 6194fab..b02c626 100644 --- a/crates/border-wars/src/main.rs +++ b/crates/border-wars/src/main.rs @@ -12,4 +12,4 @@ fn main() { .add_plugins(RendererPlugin) .add_plugins(CameraPlugin) .run(); -} \ No newline at end of file +} diff --git a/crates/border-wars/src/map/renderer.rs b/crates/border-wars/src/map/renderer.rs index d946f58..c88f986 100644 --- a/crates/border-wars/src/map/renderer.rs +++ b/crates/border-wars/src/map/renderer.rs @@ -15,7 +15,7 @@ impl Plugin for RendererPlugin { Update, render_map.run_if(in_state(crate::CurrentScene::Game)), ) - .insert_resource(ClearColor(Color::rgb_u8(129,212,250))); + .insert_resource(ClearColor(Color::rgb_u8(129, 212, 250))); } } -- 2.43.4