0.9 builds, but sometimes freezes or segfaults

Author: CleanCut

examples/collider.rs

@@ -16,6 +16,7 @@ use std::path::PathBuf;
 
 use rusty_engine::prelude::*;
 
+#[derive(Resource)]
 struct GameState {
     circle_radius: f32,
     scale: f32,

examples/collision.rs

@@ -6,6 +6,9 @@ use rusty_engine::prelude::*;
 
 const ROTATION_SPEED: f32 = 3.0;
 
+#[derive(Resource)]
+struct GameState {}
+
 fn main() {
     let mut game = Game::new();
     let msg2 = game.add_text(
@@ -15,7 +18,7 @@ fn main() {
     msg2.font_size = 20.0;
     msg2.translation.y = 340.0;
 
-    let mut race_car = game.add_sprite("Player", SpritePreset::RacingCarGreen);
+    let race_car = game.add_sprite("Player", SpritePreset::RacingCarGreen);
     race_car.translation = Vec2::new(0.0, 0.0);
     race_car.rotation = UP;
     race_car.layer = 100.0;
@@ -28,20 +31,20 @@ fn main() {
                 break 'outer;
             }
             let sprite_preset = sprite_presets_iter.next().unwrap();
-            let mut sprite = game.add_sprite(format!("{:?}", sprite_preset), sprite_preset);
+            let sprite = game.add_sprite(format!("{:?}", sprite_preset), sprite_preset);
             sprite.translation = Vec2::new(x as f32, (-y) as f32);
             sprite.collision = true;
         }
     }
 
-    let mut text = game.add_text("collision text", "");
+    let text = game.add_text("collision text", "");
     text.translation = Vec2::new(0.0, -200.0);
 
     game.add_logic(logic);
-    game.run(());
+    game.run(GameState {});
 }
 
-fn logic(engine: &mut Engine, _: &mut ()) {
+fn logic(engine: &mut Engine, _: &mut GameState) {
     // If a collision event happened last frame, print it out and play a sound
     for collision_event in engine.collision_events.drain(..) {
         let text = engine.texts.get_mut("collision text").unwrap();

examples/game_state.rs

@@ -8,6 +8,7 @@ use rusty_engine::prelude::*;
 
 // You can name your game state struct whatever you want, and it can contain many different types as
 // its fields
+#[derive(Resource)]
 struct MyCustomGameStateStuff {
     // Use a timer to tell when to start/stop turning
     change_timer: Timer,
@@ -20,7 +21,7 @@ fn main() {
     let _ = game.add_sprite("Race Car", SpritePreset::RacingCarGreen);
 
     let initial_game_state = MyCustomGameStateStuff {
-        change_timer: Timer::from_seconds(1.0, true),
+        change_timer: Timer::from_seconds(1.0, TimerMode::Repeating),
         turning: false,
     };
 

examples/keyboard_events.rs

@@ -4,10 +4,13 @@
 
 use rusty_engine::prelude::*;
 
+#[derive(Resource)]
+struct GameState {}
+
 fn main() {
     let mut game = Game::new();
 
-    let mut race_car = game.add_sprite("Race Car", SpritePreset::RacingCarGreen);
+    let race_car = game.add_sprite("Race Car", SpritePreset::RacingCarGreen);
     race_car.translation = Vec2::new(0.0, 0.0);
     race_car.rotation = UP;
     race_car.scale = 1.0;
@@ -17,15 +20,15 @@ fn main() {
     text.translation.y = 250.0;
 
     game.add_logic(logic);
-    game.run(());
+    game.run(GameState {});
 }
 
-fn logic(game_state: &mut Engine, _: &mut ()) {
+fn logic(engine: &mut Engine, _: &mut GameState) {
     // Get the race car sprite
-    let race_car = game_state.sprites.get_mut("Race Car").unwrap();
+    let race_car = engine.sprites.get_mut("Race Car").unwrap();
 
     // Loop through any keyboard input that hasn't been processed this frame
-    for keyboard_event in &game_state.keyboard_events {
+    for keyboard_event in &engine.keyboard_events {
         if let KeyboardInput {
             scan_code: _,
             key_code: Some(key_code),
@@ -50,8 +53,8 @@ fn logic(game_state: &mut Engine, _: &mut ()) {
 
             // Clamp the translation so that the car stays on the screen
             race_car.translation = race_car.translation.clamp(
-                -game_state.window_dimensions * 0.5,
-                game_state.window_dimensions * 0.5,
+                -engine.window_dimensions * 0.5,
+                engine.window_dimensions * 0.5,
             );
         }
     }

examples/keyboard_state.rs

@@ -6,10 +6,13 @@ use std::f32::consts::PI;
 
 use rusty_engine::prelude::*;
 
+#[derive(Resource)]
+struct GameState {}
+
 fn main() {
     let mut game = Game::new();
 
-    let mut race_car = game.add_sprite("Race Car", SpritePreset::RacingCarGreen);
+    let race_car = game.add_sprite("Race Car", SpritePreset::RacingCarGreen);
     race_car.translation = Vec2::new(0.0, 0.0);
     race_car.rotation = UP;
     race_car.scale = 1.0;
@@ -19,20 +22,20 @@ fn main() {
     text.translation.y = 250.0;
 
     game.add_logic(logic);
-    game.run(());
+    game.run(GameState {});
 }
 
-fn logic(game_state: &mut Engine, _: &mut ()) {
+fn logic(engine: &mut Engine, _: &mut GameState) {
     // Compute how fast we should move, rotate, and scale
-    let move_amount = 200.0 * game_state.delta_f32;
-    let rotation_amount = PI * game_state.delta_f32;
-    let scale_amount = 1.0 * game_state.delta_f32;
+    let move_amount = 200.0 * engine.delta_f32;
+    let rotation_amount = PI * engine.delta_f32;
+    let scale_amount = 1.0 * engine.delta_f32;
 
     // Get the race car sprite
-    let race_car = game_state.sprites.get_mut("Race Car").unwrap();
+    let race_car = engine.sprites.get_mut("Race Car").unwrap();
 
     // Handle keyboard input
-    let ks = &mut game_state.keyboard_state;
+    let ks = &mut engine.keyboard_state;
     if ks.pressed_any(&[KeyCode::W, KeyCode::Up, KeyCode::Comma]) {
         race_car.translation.y += move_amount;
     }
@@ -67,7 +70,7 @@ fn logic(game_state: &mut Engine, _: &mut ()) {
 
     // Clamp the translation so that the car stays on the screen
     race_car.translation = race_car.translation.clamp(
-        -game_state.window_dimensions * 0.5,
-        game_state.window_dimensions * 0.5,
+        -engine.window_dimensions * 0.5,
+        engine.window_dimensions * 0.5,
     );
 }

examples/layer.rs

@@ -4,18 +4,21 @@
 
 use rusty_engine::prelude::*;
 
+#[derive(Resource)]
+struct GameState {}
+
 fn main() {
     let mut game = Game::new();
 
     let mut layer = 0.0;
     let preset_iterator = SpritePreset::variant_iter().peekable();
     for (x, sprite_preset) in (-300..=600).step_by(30).zip(preset_iterator) {
-        let mut sprite = game.add_sprite(format!("{:?}", sprite_preset), sprite_preset);
+        let sprite = game.add_sprite(format!("{:?}", sprite_preset), sprite_preset);
         sprite.translation = Vec2::new(x as f32, (-x) as f32);
         sprite.layer = layer; // 0.0 is the bottom (back) layer. 999.0 is the top (front) layer.
         layer += 1.0;
     }
 
     // We don't do anything after game setup, so our game logic can be an empty closure
-    game.run(());
+    game.run(GameState {});
 }

examples/level_creator.rs

@@ -12,6 +12,7 @@
 
 use rusty_engine::prelude::*;
 
+#[derive(Resource)]
 struct GameState {
     current_label: String,
     // Use an incrementing index (converted to a string) for the unique label of the sprites
@@ -77,7 +78,7 @@ Z - Print out Rust code of current level
     let game_state = GameState::default();
 
     // Get our first sprite onto the board
-    let mut curr_sprite = game.add_sprite("0".to_string(), SpritePreset::RacingCarRed);
+    let curr_sprite = game.add_sprite("0".to_string(), SpritePreset::RacingCarRed);
     //curr_sprite.scale = 0.5;
     curr_sprite.layer = MAX_LAYER;
 

examples/mouse_events.rs

@@ -6,6 +6,9 @@ use rusty_engine::prelude::*;
 
 const ORIGIN_LOCATION: (f32, f32) = (0.0, -200.0);
 
+#[derive(Resource)]
+struct GameState {}
+
 fn main() {
     let mut game = Game::new();
 
@@ -35,10 +38,10 @@ fn main() {
     msg2.translation.y = 275.0;
 
     game.add_logic(logic);
-    game.run(());
+    game.run(GameState {});
 }
 
-fn logic(engine: &mut Engine, _: &mut ()) {
+fn logic(engine: &mut Engine, _: &mut GameState) {
     if let Some(sprite) = engine.sprites.get_mut("Race Car") {
         // Use mouse button events to rotate. Every click rotates the sprite by a fixed amount
         for mouse_button_input in &engine.mouse_button_events {

examples/mouse_state.rs

@@ -7,6 +7,9 @@ use rusty_engine::prelude::*;
 const ORIGIN_LOCATION: (f32, f32) = (0.0, -200.0);
 const ROTATION_SPEED: f32 = 3.0;
 
+#[derive(Resource)]
+struct GameState {}
+
 fn main() {
     let mut game = Game::new();
 
@@ -36,10 +39,10 @@ fn main() {
     msg2.translation.y = 275.0;
 
     game.add_logic(logic);
-    game.run(());
+    game.run(GameState {});
 }
 
-fn logic(engine: &mut Engine, _: &mut ()) {
+fn logic(engine: &mut Engine, _: &mut GameState) {
     if let Some(sprite) = engine.sprites.get_mut("Race Car") {
         // Use the latest state of the mouse buttons to rotate the sprite
         let mut rotation_amount = 0.0;

examples/music.rs

@@ -7,6 +7,9 @@
 
 use rusty_engine::prelude::*;
 
+#[derive(Resource)]
+struct GameState {}
+
 fn main() {
     let mut game = Game::new();
     let msg = game.add_text(
@@ -24,5 +27,5 @@ fn main() {
 
     game.audio_manager.play_music(MusicPreset::Classy8Bit, 1.0);
 
-    game.run(());
+    game.run(GameState {});
 }