update
Some checks failed
Rust Checks / checks (push) Failing after 2m43s
Rust Checks / checks (pull_request) Failing after 3m0s

This commit is contained in:
CoCo_Sol 2024-03-02 23:18:34 +01:00
parent 805e055a66
commit 874878845e
2 changed files with 4 additions and 17 deletions

View file

@ -1,28 +1,19 @@
//! The main entry point of the game. //! The main entry point of the game.
use bevy::prelude::*; use bevy::prelude::*;
use border_wars::camera::CameraPlugin;
use border_wars::map::generation::{EndMapGeneration, MapGenerationPlugin, StartMapGeneration}; use border_wars::map::generation::{EndMapGeneration, MapGenerationPlugin, StartMapGeneration};
use border_wars::map::renderer::RendererPlugin; use border_wars::map::renderer::RendererPlugin;
use border_wars::map::Tile; use border_wars::map::Tile;
use border_wars::camera::CameraPlugin;
use border_wars::scenes::ScenesPlugin; use border_wars::scenes::ScenesPlugin;
fn setup(mut writer: EventWriter<StartMapGeneration>) { fn setup(mut writer: EventWriter<StartMapGeneration>) {
writer.send(StartMapGeneration { writer.send(StartMapGeneration {
seed: 9876, seed: 7128,
radius: 7, radius: 30,
}); });
} }
fn update(mut writer: EventWriter<StartMapGeneration>, mut reader: EventReader<EndMapGeneration>, mut query: Query<&mut Tile> ) {
for _ in reader.read() {
for mut tile in query.iter_mut() {
*tile = Tile::Hill;
}
}
}
fn main() { fn main() {
App::new() App::new()
.add_plugins(DefaultPlugins) .add_plugins(DefaultPlugins)
@ -30,10 +21,6 @@ fn main() {
.add_plugins(RendererPlugin) .add_plugins(RendererPlugin)
.add_plugins(MapGenerationPlugin) .add_plugins(MapGenerationPlugin)
.add_systems(OnEnter(border_wars::CurrentScene::Game), setup) .add_systems(OnEnter(border_wars::CurrentScene::Game), setup)
.add_systems(
Update,
update.run_if(in_state(border_wars::CurrentScene::Game)),
)
.add_plugins(CameraPlugin) .add_plugins(CameraPlugin)
.run(); .run();
} }

View file

@ -46,7 +46,7 @@ fn render_map(
transform: Transform::from_translation(Vec3 { transform: Transform::from_translation(Vec3 {
x: position_x, x: position_x,
y: position_y, 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), texture: tile.get_texture(&*asset_server),
..default() ..default()