diff options
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/main.rs b/src/main.rs index 63ed48f..0dd725d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -31,7 +31,7 @@ use crate::{ Input::{self}, InputManager, }, - proc_gen::{WorldGenerator, WorldGeneratorConfig}, + proc_gen::TilesetWorldGenerator, renderer::RendererState, sim::{entity::EntityDef, rb_manager::DebugRenderMode, sim_manager::SimManager}, vfx::VfxManager, @@ -48,9 +48,8 @@ struct Config { cells_render: bool, debug_render: bool, debug_render_mode: DebugRenderMode, - // proc gen - world_generator_config: WorldGeneratorConfig, + // world_generator_config: WorldGeneratorConfig, } struct Diagnostics { @@ -68,7 +67,7 @@ struct App { camera: Option<Camera>, vfx_manager: Option<VfxManager>, sim_manager: Option<SimManager>, - world_generator: Option<WorldGenerator>, + world_generator: TilesetWorldGenerator, // renderer last_render: Instant, @@ -137,8 +136,6 @@ impl Default for App { cells_render: true, debug_render: false, debug_render_mode: DebugRenderMode::default(), - - world_generator_config: WorldGeneratorConfig::default(), }; Self { window: None, @@ -150,7 +147,7 @@ impl Default for App { vfx_manager: Some(VfxManager::new()), sim_manager: Some(SimManager::new()), - world_generator: Some(WorldGenerator::new(config.world_generator_config)), + world_generator: TilesetWorldGenerator::new("assets/tilesets/tileset1"), last_render: Instant::now(), @@ -237,7 +234,6 @@ impl ApplicationHandler for App { && let Some(sim) = &mut self.sim_manager && let Some(vfx) = &mut self.vfx_manager && let Some(camera) = &mut self.camera - && let Some(world_generator) = &mut self.world_generator { renderer_state.render( sim, @@ -246,7 +242,7 @@ impl ApplicationHandler for App { &mut self.config, &self.diagnostics, &self.input_manager, - world_generator, + &self.world_generator, ); vfx.after_render(delta_time); |