refactor: move physics to pixel-game-lib

Author: tversteeg

Cargo.toml

@@ -32,10 +32,10 @@ bvh-arena = "1"
 raqote = { version = "0.8", default-features = false }
 bitvec = "1"
 line_drawing = "1"
-drawille = { version = "0.3.0", optional = true }
-spiral = "0.2.0"
-pixel-game-lib = "0.3.0"
-winit_input_helper = "0.14.1"
+drawille = { version = "0.3", optional = true }
+spiral = "0.2"
+pixel-game-lib = "0.3"
+winit_input_helper = "0.14"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 fastrand = "2"

src/debug.rs

@@ -1,24 +1,20 @@
 use line_drawing::Bresenham;
-use pixel_game_lib::window::Key;
-use serde::Deserialize;
-use vek::{Extent2, Vec2};
-use winit_input_helper::WinitInputHelper;
-
-use crate::{
-    camera::Camera,
-    graphics::Color,
+use pixel_game_lib::{
     math::{Iso, Rotation},
-    object::ObjectSettings,
     physics::{
         collision::{shape::Shape, CollisionResponse},
         rigidbody::{RigidBodyBuilder, RigidBodyHandle},
         Physics,
     },
-    projectile::Projectile,
-    solid_shape::SolidShape,
-    sprite::SpriteOffset,
-    terrain::Terrain,
-    SIZE,
+    window::Key,
+};
+use serde::Deserialize;
+use vek::{Extent2, Vec2};
+use winit_input_helper::WinitInputHelper;
+
+use crate::{
+    camera::Camera, graphics::Color, object::ObjectSettings, projectile::Projectile,
+    solid_shape::SolidShape, terrain::Terrain, SIZE,
 };
 
 /// Asset paths.
@@ -164,7 +160,7 @@ impl DebugDraw {
         if let Some(mouse) = mouse {
             if self.screen == DebugScreen::SpawnCubes {
                 if input.key_held(Key::Space) {
-                    self.physics.step(dt);
+                    self.physics.step(dt, &crate::settings().physics);
                 }
 
                 if input.mouse_released(0) {

src/game.rs

@@ -1,5 +1,8 @@
 use assets_manager::{loader::TomlLoader, Asset};
-use pixel_game_lib::canvas::Canvas;
+use pixel_game_lib::{
+    canvas::Canvas,
+    physics::{Physics, PhysicsSettings},
+};
 use serde::Deserialize;
 use vek::Vec2;
 use winit_input_helper::WinitInputHelper;
@@ -8,7 +11,6 @@ use winit_input_helper::WinitInputHelper;
 use crate::debug::{DebugDraw, DebugSettings};
 use crate::{
     camera::Camera,
-    physics::{Physics, Settings as PhysicsSettings},
     projectile::Projectile,
     terrain::Settings as TerrainSettings,
     terrain::Terrain,
@@ -109,7 +111,7 @@ impl GameState {
         }
 
         // Simulate the physics
-        self.physics.step(dt);
+        self.physics.step(dt, &settings.physics);
 
         // Update all projectiles
         self.projectiles

src/gen/isoline.rs

@@ -1,8 +1,7 @@
 use itertools::Itertools;
+use pixel_game_lib::physics::collision::shape::Shape;
 use vek::{Extent2, Vec2};
 
-use crate::physics::collision::shape::Shape;
-
 use super::bitmap::Bitmap;
 
 /// Isoline mesh from a bitmap that can be updated.

src/main.rs

@@ -6,9 +6,7 @@ mod font;
 mod game;
 mod gen;
 mod graphics;
-mod math;
 mod object;
-mod physics;
 mod projectile;
 mod random;
 mod solid_shape;

src/math.rs

@@ -1,11 +1,9 @@
 use assets_manager::{loader::TomlLoader, AnyCache, Asset, BoxedError, Compound, SharedString};
+use pixel_game_lib::physics::{collision::shape::Shape, rigidbody::RigidBodyBuilder};
 use serde::Deserialize;
 use vek::{Extent2, Vec2};
 
-use crate::{
-    physics::{collision::shape::Shape, rigidbody::RigidBodyBuilder},
-    sprite::Sprite,
-};
+use crate::sprite::Sprite;
 
 /// Loadable object with physics.
 pub struct ObjectSettings {