fix(physics): use proper settings for projectile physics

Author: tversteeg

assets/unit/enemy-spear.ron

@@ -22,7 +22,7 @@
     // Size of the healthbar
     healthbar_size: (20, 3),
     // Where above the unit it floats
-    healthbar_offset: (-10, -25),
+    healthbar_offset: (-1, -8),
 
     // physics: (
     //     // Handle all collisions manually

assets/unit/spear.ron

@@ -13,26 +13,14 @@
     // Interval in seconds for when a new projectile is thrown
     projectile_spawn_interval: 5,
     // Don't let the projectile spawn in the ground
-    projectile_spawn_offset: (0, -40),
+    projectile_spawn_offset: (0, -20),
     // How fast a projectile is thrown
-    projectile_velocity: Range( min: 5, max: 10 ),
+    projectile_velocity: Range(min: 50, max: 100),
     // How long the hands are hidden after launching a projectile in seconds
     hide_hands_delay: 2,
 
     // Size of the healthbar
     healthbar_size: (20, 3),
     // Where above the unit it floats
-    healthbar_offset: (-10, -25),
-
-    // physics: (
-    //     // Handle all collisions manually
-    //     is_kinematic: true,
-    // ),
-
-    // // Collider shape for collisions with projectile
-    // collider: (
-    //     shape: "rectangle",
-    //     width: 10,
-    //     height: 30,
-    // ),
+    healthbar_offset: (-3, -8),
 )

src/main.rs

@@ -16,8 +16,8 @@ use terrain::Terrain;
 use unit::{Unit, UnitType};
 use utils::timer::Timer;
 
-const WIDTH: f32 = 320.0;
-const HEIGHT: f32 = 240.0;
+const WIDTH: f32 = 640.0;
+const HEIGHT: f32 = 480.0;
 
 /// Game state.
 pub enum GameState {
@@ -96,7 +96,7 @@ impl Game for GameState {
                 terrain.draw(ctx.clone(), *camera);
 
                 // Update all projectiles
-                projectiles.retain_mut(|projectile| projectile.update(terrain, ctx.clone()));
+                projectiles.retain_mut(|projectile| !projectile.update(terrain, dt, &settings));
 
                 // Update all units
                 units.iter_mut().for_each(|unit| {
@@ -128,7 +128,7 @@ impl Game for GameState {
 
     fn render(&mut self, ctx: Context) {
         // Draw a basic FPS counter
-        let fps = ctx.delta_time().recip();
+        let fps = ctx.frames_per_second();
         ctx.text("font.torus-sans", &format!("{fps:.1}")).draw();
 
         match self {

src/projectile.rs

@@ -23,11 +23,11 @@ impl Projectile {
     /// Move the projectile.
     ///
     /// Returns whether the projectile should be removed.
-    pub fn update(&mut self, terrain: &Terrain, ctx: Context) -> bool {
+    pub fn update(&mut self, terrain: &Terrain, dt: f32, settings: &Settings) -> bool {
         puffin::profile_function!();
 
-        self.pos += self.vel * ctx.delta_time();
-        self.vel.y += ctx.asset::<Settings>("settings").projectile_gravity;
+        self.pos += self.vel * dt;
+        self.vel.y += settings.projectile_gravity * dt;
 
         terrain.point_collides(self.pos)
     }

src/unit.rs

@@ -140,13 +140,20 @@ impl Unit {
     pub fn render(&self, camera: Camera, ctx: Context) {
         puffin::profile_scope!("Unit render");
 
+        let settings = self.settings(ctx.clone());
+
         let draw_pos = self.pos - self.ground_collision_point() + camera.into();
 
         ctx.sprite(self.r#type.asset_path())
             .translate(draw_pos)
             .draw();
 
-        if let Some(hands_asset_path) = &self.settings(ctx.clone()).hands_asset_path {
+        ctx.text("font.debug", &format!("{}", self.health))
+            .translate(draw_pos)
+            .translate(settings.healthbar_offset)
+            .draw();
+
+        if let Some(hands_asset_path) = &settings.hands_asset_path {
             if self.hide_hands_delay <= 0.0 {
                 ctx.sprite(hands_asset_path)
                     .translate(draw_pos - Vector2::splat(1.0))