diff --git a/src/activities/mod.rs b/src/activities/mod.rs index 5d0b11f..34a90d7 100644 --- a/src/activities/mod.rs +++ b/src/activities/mod.rs @@ -1,8 +1,9 @@ pub mod house; pub mod overworld; -#[derive(Debug)] +#[derive(Debug, Default)] pub enum Activity { + #[default] House, Overworld } diff --git a/src/activities/overworld.rs b/src/activities/overworld.rs index 2200ed6..ea12f22 100644 --- a/src/activities/overworld.rs +++ b/src/activities/overworld.rs @@ -1,5 +1,7 @@ use comfy::*; +pub mod worldgen; + pub fn draw(_state: &crate::State, _engine: &comfy::EngineContext) { draw_circle(vec2(0.0, 0.0), 0.5, GREEN, 0); } diff --git a/src/activities/overworld/worldgen.rs b/src/activities/overworld/worldgen.rs new file mode 100644 index 0000000..2a84e41 --- /dev/null +++ b/src/activities/overworld/worldgen.rs @@ -0,0 +1,9 @@ + +#[derive(Debug)] +pub struct Overworld; + +impl Default for Overworld { + fn default() -> Self { + Self + } +} diff --git a/src/main.rs b/src/main.rs index 4992bdf..a310d1e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,22 +1,15 @@ mod activities; mod game; -use activities::Activity; +use activities::{overworld::worldgen::Overworld, Activity}; use comfy::*; const GAME_NAME: &str = "Powercreep"; -#[derive(Debug)] +#[derive(Debug, Default)] struct State { - activity: Activity -} - -impl Default for State { - fn default() -> Self { - Self { - activity: Activity::House - } - } + activity: Activity, + overworld: Overworld, } impl GameLoop for State {