evan/ludum-dare-49
Archived
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finally load the loading screen

Browse Source
This commit is contained in:
Evan Pratten 2021-09-30 09:41:43 -04:00
parent 6023c6c196
commit f0c6444f33
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/Cargo.toml
View File

@ -18,7 +18,7 @@ rust-embed = "6.2.0"
raylib = "3.5" raylib = "3.5"
puffin = "0.9" puffin = "0.9"
puffin_http = "0.6" puffin_http = "0.6"
dirty-fsm = "^0.2.1" dirty-fsm = "^0.2.2"
num-traits = "0.2" num-traits = "0.2"
sentry = "0.23" sentry = "0.23"

10
game/src/lib.rs
View File

@ -75,15 +75,10 @@ use raylib::prelude::*;
use tracing::{error, info}; use tracing::{error, info};
use utilities::discord::DiscordConfig; use utilities::discord::DiscordConfig;
use crate::{ use crate::{context::GameContext, discord_rpc::{maybe_set_discord_presence, try_connect_to_local_discord}, scenes::{Scenes, build_screen_state_machine}, utilities::shaders::{
context::GameContext,
discord_rpc::{maybe_set_discord_presence, try_connect_to_local_discord},
scenes::build_screen_state_machine,
utilities::shaders::{
shader::ShaderWrapper, shader::ShaderWrapper,
util::{dynamic_screen_texture::DynScreenTexture, render_texture::render_to_texture}, util::{dynamic_screen_texture::DynScreenTexture, render_texture::render_to_texture},
}, }};
};
#[macro_use] #[macro_use]
extern crate thiserror; extern crate thiserror;
@ -131,6 +126,7 @@ pub async fn game_begin(game_config: &GameConfig) -> Result<(), Box<dyn std::err
// Get the main state machine // Get the main state machine
let mut game_state_machine = build_screen_state_machine().unwrap(); let mut game_state_machine = build_screen_state_machine().unwrap();
game_state_machine.force_change_state(Scenes::LoadingScreen).unwrap();
let context; let context;
let raylib_thread; let raylib_thread;