diff --git a/Cargo.toml b/Cargo.toml index 0851b5d..a69c94c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,7 @@ edition = "2021" [dependencies] engine = { path = "../Gavania/engine", features = ["graphical"] } +assetpath = { git = "https://gavania.de/hodasemi/vulkan_lib.git" } anyhow = { version = "1.0.70", features = ["backtrace"] } diff --git a/resources/ExportedFont.png b/resources/ExportedFont.png new file mode 100644 index 0000000..d10f072 Binary files /dev/null and b/resources/ExportedFont.png differ diff --git a/resources/button_dark.png b/resources/button_dark.png new file mode 100644 index 0000000..4756e34 Binary files /dev/null and b/resources/button_dark.png differ diff --git a/resources/button_light.png b/resources/button_light.png new file mode 100644 index 0000000..2dca9ae Binary files /dev/null and b/resources/button_light.png differ diff --git a/src/game.rs b/src/game.rs index 8a95076..461075b 100644 --- a/src/game.rs +++ b/src/game.rs @@ -34,18 +34,18 @@ impl EngineObject for MillGame { fn event(&self, event: EngineEvent) -> Result<()> { match event { - EngineEvent::MouseMotion(_, _) => todo!(), - EngineEvent::MouseButtonDown(_) => todo!(), - EngineEvent::MouseButtonUp(_) => todo!(), - EngineEvent::MouseWheel(_, _, _) => todo!(), - EngineEvent::KeyDown(_) => todo!(), - EngineEvent::KeyUp(_) => todo!(), - EngineEvent::ButtonDown(_) => todo!(), - EngineEvent::ButtonUp(_) => todo!(), - EngineEvent::ControllerAxis(_) => todo!(), - EngineEvent::ControllerAdded(_) => todo!(), - EngineEvent::ControllerRemoved(_) => todo!(), - EngineEvent::FileDrop(_) => todo!(), + EngineEvent::MouseMotion(_, _) => (), + EngineEvent::MouseButtonDown(_) => (), + EngineEvent::MouseButtonUp(_) => (), + EngineEvent::MouseWheel(_, _, _) => (), + EngineEvent::KeyDown(_) => (), + EngineEvent::KeyUp(_) => (), + EngineEvent::ButtonDown(_) => (), + EngineEvent::ButtonUp(_) => (), + EngineEvent::ControllerAxis(_) => (), + EngineEvent::ControllerAdded(_) => (), + EngineEvent::ControllerRemoved(_) => (), + EngineEvent::FileDrop(_) => (), } Ok(()) diff --git a/src/main.rs b/src/main.rs index 70951ff..39d72a4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,12 +2,25 @@ mod board; mod game; use anyhow::Result; +use assetpath::AssetPath; use engine::prelude::*; use game::MillGame; fn main() -> Result<()> { let mut create_info = EngineCreateInfo::default(); - create_info.resource_base_path = "".to_string(); + + create_info.resource_base_path = "resources".to_string(); + + create_info.gui_info.font = Font::Path(AssetPath::from(("resources", "ExportedFont.png"))); + create_info.gui_info.menu_button = AssetPath::from("button_dark.png"); + create_info.gui_info.menu_button_selected = AssetPath::from("button_light.png"); + create_info.gui_info.resource_directory = + AssetPath::from((create_info.resource_base_path.as_str(), "")); + + create_info.graphics_info.render_scale = 1.0; + + create_info.window_info.height = 600; + create_info.window_info.width = 800; let engine = Engine::new(create_info)?;