zgui: Add Err enum to examples

EvoTeamDevelop · Jun 6, 2021 · d603e6a · d603e6a
1 parent 77a0da6
commit d603e6a
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 12 deletions.
diff --git a/zgui/examples/absolute_coordinates.rs b/zgui/examples/absolute_coordinates.rs
@@ -29,7 +29,7 @@ fn draw_scene() {
 #[mq::main("ZGui: Absolute Coordinates Demo")]
 #[macroquad(crate_rename = "mq")]
 async fn main() {
-    let assets = common::Assets::load().await;
+    let assets = common::Assets::load().await.expect("Can't load assets");
     let mut gui = make_gui(assets.font).expect("Can't create the gui");
     loop {
         // Update the camera and the GUI.

diff --git a/zgui/examples/common/mod.rs b/zgui/examples/common/mod.rs
@@ -7,6 +7,24 @@ use mq::{
     texture::{self, Texture2D},
 };
 
+#[derive(Debug)]
+pub enum Err {
+    File(mq::file::FileError),
+    Font(mq::text::FontError),
+}
+
+impl From<mq::file::FileError> for Err {
+    fn from(err: mq::file::FileError) -> Self {
+        Err::File(err)
+    }
+}
+
+impl From<mq::text::FontError> for Err {
+    fn from(err: mq::text::FontError) -> Self {
+        Err::Font(err)
+    }
+}
+
 pub fn aspect_ratio() -> f32 {
     mq::window::screen_width() / mq::window::screen_height()
 }
@@ -33,11 +51,9 @@ pub struct Assets {
 }
 
 impl Assets {
-    pub async fn load() -> Self {
-        let font = load_ttf_font("zgui/assets/Karla-Regular.ttf")
-            .await
-            .unwrap();
-        let texture = texture::load_texture("zgui/assets/fire.png").await.unwrap();
-        Self { font, texture }
+    pub async fn load() -> Result<Self, Err> {
+        let font = load_ttf_font("zgui/assets/Karla-Regular.ttf").await?;
+        let texture = texture::load_texture("zgui/assets/fire.png").await?;
+        Ok(Self { font, texture })
     }
 }
diff --git a/zgui/examples/layers_layout.rs b/zgui/examples/layers_layout.rs
@@ -26,7 +26,7 @@ fn make_gui(assets: common::Assets) -> ui::Result<ui::Gui<Message>> {
 #[mq::main("ZGui: Layers Layout Demo")]
 #[macroquad(crate_rename = "mq")]
 async fn main() {
-    let assets = common::Assets::load().await;
+    let assets = common::Assets::load().await.expect("Can't load assets");
     let mut gui = make_gui(assets).expect("Can't create the gui");
     loop {
         // Update the camera and the GUI.

diff --git a/zgui/examples/nested.rs b/zgui/examples/nested.rs
@@ -70,7 +70,7 @@ fn make_gui(assets: common::Assets) -> ui::Result<ui::Gui<Message>> {
 #[mq::main("ZGui: Nested Layouts Demo")]
 #[macroquad(crate_rename = "mq")]
 async fn main() {
-    let assets = common::Assets::load().await;
+    let assets = common::Assets::load().await.expect("Can't load assets");
     let mut gui = make_gui(assets).expect("Can't create the gui");
     loop {
         // Update the camera and the GUI.

diff --git a/zgui/examples/pixel_coordinates.rs b/zgui/examples/pixel_coordinates.rs
@@ -45,7 +45,7 @@ fn draw_scene() {
 #[mq::main("ZGui: Pixel Coordinates Demo")]
 #[macroquad(crate_rename = "mq")]
 async fn main() {
-    let assets = common::Assets::load().await;
+    let assets = common::Assets::load().await.expect("Can't load assets");
     let mut gui = make_gui(assets.font).expect("Can't create the gui");
     loop {
         // Update the camera and the GUI.

diff --git a/zgui/examples/remove.rs b/zgui/examples/remove.rs
@@ -68,7 +68,7 @@ impl State {
 #[mq::main("ZGui: Remove Widget Demo")]
 #[macroquad(crate_rename = "mq")]
 async fn main() {
-    let assets = common::Assets::load().await;
+    let assets = common::Assets::load().await.expect("Can't load assets");
     let mut state = State::new(assets).expect("Can't create the game state");
     loop {
         // Update the camera and the GUI.

diff --git a/zgui/examples/text_button.rs b/zgui/examples/text_button.rs
@@ -21,7 +21,7 @@ fn make_gui(font: mq::text::Font) -> ui::Result<ui::Gui<Message>> {
 #[mq::main("ZGui: Text Button Demo")]
 #[macroquad(crate_rename = "mq")]
 async fn main() {
-    let assets = common::Assets::load().await;
+    let assets = common::Assets::load().await.expect("Can't load assets");
     let mut gui = make_gui(assets.font).expect("Can't create the gui");
     loop {
         // Update the camera and the GUI.