diff --git a/crates/border-wars/src/main.rs b/crates/border-wars/src/main.rs index 8423510..d0d3a20 100644 --- a/crates/border-wars/src/main.rs +++ b/crates/border-wars/src/main.rs @@ -1,28 +1,19 @@ //! The main entry point of the game. use bevy::prelude::*; +use border_wars::camera::CameraPlugin; use border_wars::map::generation::{EndMapGeneration, MapGenerationPlugin, StartMapGeneration}; use border_wars::map::renderer::RendererPlugin; use border_wars::map::Tile; -use border_wars::camera::CameraPlugin; use border_wars::scenes::ScenesPlugin; fn setup(mut writer: EventWriter) { writer.send(StartMapGeneration { - seed: 9876, - radius: 7, + seed: 7128, + radius: 30, }); } - -fn update(mut writer: EventWriter, mut reader: EventReader, mut query: Query<&mut Tile> ) { - for _ in reader.read() { - for mut tile in query.iter_mut() { - *tile = Tile::Hill; - } - } -} - fn main() { App::new() .add_plugins(DefaultPlugins) @@ -30,10 +21,6 @@ fn main() { .add_plugins(RendererPlugin) .add_plugins(MapGenerationPlugin) .add_systems(OnEnter(border_wars::CurrentScene::Game), setup) - .add_systems( - Update, - update.run_if(in_state(border_wars::CurrentScene::Game)), - ) .add_plugins(CameraPlugin) .run(); } diff --git a/crates/border-wars/src/map/renderer.rs b/crates/border-wars/src/map/renderer.rs index 209d27c..c9d9e25 100644 --- a/crates/border-wars/src/map/renderer.rs +++ b/crates/border-wars/src/map/renderer.rs @@ -46,7 +46,7 @@ fn render_map( transform: Transform::from_translation(Vec3 { x: position_x, y: position_y, - z: -position_y, + z: -1.0 / (1.0 + (-position_y * 10_f64.powf(-5.0) as f32).exp()), }), texture: tile.get_texture(&*asset_server), ..default()