From 76a94edde9eaf5c6521e0f835c55c6b233640a90 Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Thu, 30 Sep 2021 09:47:07 -0400
Subject: [PATCH] working on making the loading screen load a texture

---
 game/assets/logos/game-logo.png   | Bin 0 -> 3163 bytes
 game/src/lib.rs                   |  21 +++++++++++++++------
 game/src/scenes/loading_screen.rs |  17 ++++++++++++-----
 game/src/scenes/mod.rs            |   7 ++++---
 4 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 game/assets/logos/game-logo.png

diff --git a/game/assets/logos/game-logo.png b/game/assets/logos/game-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f734b3cabc4bf60ad12ea837b330be38d2df2b4
GIT binary patch
literal 3163
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
B{zd=*

literal 0
HcmV?d00001

diff --git a/game/src/lib.rs b/game/src/lib.rs
index c79bc08..c042bdc 100644
--- a/game/src/lib.rs
+++ b/game/src/lib.rs
@@ -75,10 +75,15 @@ use raylib::prelude::*;
 use tracing::{error, info};
 use utilities::discord::DiscordConfig;
 
-use crate::{context::GameContext, discord_rpc::{maybe_set_discord_presence, try_connect_to_local_discord}, scenes::{Scenes, build_screen_state_machine}, utilities::shaders::{
+use crate::{
+    context::GameContext,
+    discord_rpc::{maybe_set_discord_presence, try_connect_to_local_discord},
+    scenes::{build_screen_state_machine, Scenes},
+    utilities::shaders::{
         shader::ShaderWrapper,
         util::{dynamic_screen_texture::DynScreenTexture, render_texture::render_to_texture},
-    }};
+    },
+};
 
 #[macro_use]
 extern crate thiserror;
@@ -124,10 +129,6 @@ pub async fn game_begin(game_config: &GameConfig) -> Result<(), Box<dyn std::err
     .await
     .unwrap();
 
-    // Get the main state machine
-    let mut game_state_machine = build_screen_state_machine().unwrap();
-    game_state_machine.force_change_state(Scenes::LoadingScreen).unwrap();
-
     let context;
     let raylib_thread;
     {
@@ -149,6 +150,14 @@ pub async fn game_begin(game_config: &GameConfig) -> Result<(), Box<dyn std::err
         context = Box::new(GameContext::new(RefCell::new(rl.into())));
     }
 
+    // Get the main state machine
+    info!("Setting up the scene management state machine");
+    let mut game_state_machine =
+        build_screen_state_machine(&context.renderer.borrow_mut(), &raylib_thread).unwrap();
+    game_state_machine
+        .force_change_state(Scenes::LoadingScreen)
+        .unwrap();
+
     // Create a dynamic texture to draw to for processing by shaders
     info!("Allocating a SNOWZ7Zresizable texture for the screen");
     let mut dynamic_texture =
diff --git a/game/src/scenes/loading_screen.rs b/game/src/scenes/loading_screen.rs
index b37711e..2b9c925 100644
--- a/game/src/scenes/loading_screen.rs
+++ b/game/src/scenes/loading_screen.rs
@@ -1,7 +1,11 @@
 use chrono::{DateTime, Utc};
 use dirty_fsm::{Action, ActionFlag};
+use raylib::RaylibThread;
 
-use crate::{context::GameContext, utilities::render_layer::ScreenSpaceRender};
+use crate::{
+    context::GameContext,
+    utilities::{non_ref_raylib::HackedRaylibHandle, render_layer::ScreenSpaceRender},
+};
 
 use super::{Scenes, ScreenError};
 use tracing::{debug, info, trace};
@@ -16,7 +20,13 @@ pub struct LoadingScreen {
 
 impl LoadingScreen {
     /// Construct a new `LoadingScreen`
-    pub fn new() -> Self {
+    pub fn new(raylib_handle: &HackedRaylibHandle, thread: &RaylibThread) -> Self {
+
+        // Load the game logo asset
+        // TODO: in-memory texture loading
+        // raylib_handle.load_texture_from_image(, image)
+
+
         Self {
             start_timestamp: None,
         }
@@ -78,8 +88,5 @@ impl ScreenSpaceRender for LoadingScreen {
 
         // Calculate the loading screen fade in/out value
         // This makes the loading screen fade in/out over the duration of the loading screen
-
-
-
     }
 }
diff --git a/game/src/scenes/mod.rs b/game/src/scenes/mod.rs
index c4f3252..a4d84a3 100644
--- a/game/src/scenes/mod.rs
+++ b/game/src/scenes/mod.rs
@@ -1,5 +1,6 @@
 use dirty_fsm::StateMachine;
-use crate::context::GameContext;
+use raylib::RaylibThread;
+use crate::{context::GameContext, utilities::non_ref_raylib::HackedRaylibHandle};
 use self::{fsm_error_screen::FsmErrorScreen, loading_screen::LoadingScreen};
 
 pub mod fsm_error_screen;
@@ -18,13 +19,13 @@ pub enum Scenes {
 pub enum ScreenError {}
 
 /// Build the state machine for all scenes
-pub fn build_screen_state_machine() -> Result<
+pub fn build_screen_state_machine(raylib_handle: &HackedRaylibHandle, thread: &RaylibThread) -> Result<
     // StateMachine<Scenes, ScreenError, RefCell<(NonRefDrawHandle, Rc<RefCell<GameContext>>)>>,
     StateMachine<Scenes, ScreenError, GameContext>,
     ScreenError,
 > {
     let mut machine = StateMachine::new();
     machine.add_action(Scenes::FsmErrorScreen, FsmErrorScreen::new())?;
-    machine.add_action(Scenes::LoadingScreen, LoadingScreen::new())?;
+    machine.add_action(Scenes::LoadingScreen, LoadingScreen::new(raylib_handle, thread))?;
     Ok(machine)
 }