Add content pack system (#7)

* Refactor model loading

* Move terrain data out of Renderer

* Support multiple colliders

* Content packs

* Fix update problem

* Cylinder gravity

* cargo fmt

* Prettify code

* Assert level file ends with ".ron"

* Rename "content_packs" to "content-packs"

* Rename remove "vangers-ffi"

Author: lpenguin

Cargo.lock

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["lib/ffi"]
+members = ["lib/content-packs"]
 
 [workspace.dependencies]
 blade-graphics = "0.6"

Cargo.toml

@@ -1,10 +1,15 @@
 use blade_graphics as gpu;
-use vandals_and_heroes::{config, Camera, ModelDesc, Object, Physics, Render, TerrainBody};
+use vandals_and_heroes::{
+    config, Camera, Loader, ModelDesc, ModelInstance, Physics, PhysicsBodyHandle, Render, Terrain,
+    TerrainBody,
+};
 
+use nalgebra::Matrix4;
 use std::{f32, fs, path, sync::Arc, thread, time};
 
-struct Car {
-    body: Object,
+pub struct Object {
+    pub model_instance: ModelInstance,
+    pub rigid_body: rapier3d::dynamics::RigidBodyHandle,
 }
 
 pub struct Game {
@@ -22,7 +27,8 @@ pub struct Game {
     last_mouse_pos: [i32; 2],
     // game
     terrain_body: TerrainBody,
-    car: Car,
+    terrain: Terrain,
+    car: Object,
 }
 
 pub struct QuitEvent;
@@ -65,29 +71,15 @@ impl Game {
 
         let mut loader = render.start_loading();
 
-        let car_body = {
-            log::info!("Loading car: {}", config.car);
-            let car_path = path::PathBuf::from("data/cars").join(config.car);
-            let car_config: config::Car = ron::de::from_bytes(
-                &fs::read(car_path.join("car.ron")).expect("Unable to open the car config"),
-            )
-            .expect("Unable to parse the car config");
-            let desc = ModelDesc {
-                scale: car_config.scale,
-                density: car_config.density,
-            };
-            loader.load_gltf(&car_path.join("body.glb"), desc)
-        };
-
-        let map_config = {
+        let terrain = {
             log::info!("Loading map: {}", config.map);
             let map_path = path::PathBuf::from("data/maps").join(config.map);
             let mut map_config: config::Map = ron::de::from_bytes(
                 &fs::read(map_path.join("map.ron")).expect("Unable to open the map config"),
             )
             .expect("Unable to parse the map config");
 
-            let (map_texture, map_extent) = loader.load_png(&map_path.join("map.png"));
+            let (texture, map_extent) = loader.load_png(&map_path.join("map.png"));
 
             if map_config.length == 0.0 {
                 let circumference = 2.0 * f32::consts::PI * map_config.radius.start;
@@ -96,44 +88,50 @@ impl Game {
                 log::info!("Derived map length to be {}", map_config.length);
             }
 
-            let submission = loader.finish();
-            render.accept_submission(submission);
-            render.set_map(map_texture, &map_config);
-
-            map_config
+            Terrain {
+                config: map_config,
+                texture,
+            }
         };
+        let mut physics = Physics::default();
+        let terrain_body = physics.create_terrain(&terrain.config);
+
+        let car = Self::load_car(
+            &mut loader,
+            &mut physics,
+            &config.car,
+            nalgebra::Isometry3 {
+                translation: nalgebra::Vector3::new(
+                    0.0,
+                    0.35 * terrain.config.radius.start + 0.65 * terrain.config.radius.end,
+                    0.1 * terrain.config.length,
+                )
+                .into(),
+                rotation: nalgebra::UnitQuaternion::from_axis_angle(
+                    &nalgebra::Vector3::y_axis(),
+                    0.5 * f32::consts::PI,
+                ),
+            },
+        );
+
+        let submission = loader.finish();
+        render.accept_submission(submission);
+        render.wait_for_gpu();
 
         let camera = Camera {
-            pos: nalgebra::Vector3::new(0.0, map_config.radius.end, 0.1 * map_config.length),
+            pos: nalgebra::Vector3::new(
+                0.0,
+                terrain.config.radius.end,
+                0.1 * terrain.config.length,
+            ),
             rot: nalgebra::UnitQuaternion::from_axis_angle(
                 &nalgebra::Vector3::x_axis(),
                 0.3 * f32::consts::PI,
             ),
-            clip: 1.0..map_config.length,
+            clip: 1.0..terrain.config.length,
             ..Default::default()
         };
 
-        let mut physics = Physics::default();
-        let terrain_body = physics.create_terrain(&map_config);
-
-        let car = Car {
-            body: physics.create_object(
-                Arc::new(car_body),
-                nalgebra::Isometry3 {
-                    translation: nalgebra::Vector3::new(
-                        0.0,
-                        0.35 * map_config.radius.start + 0.65 * map_config.radius.end,
-                        0.1 * map_config.length,
-                    )
-                    .into(),
-                    rotation: nalgebra::UnitQuaternion::from_axis_angle(
-                        &nalgebra::Vector3::y_axis(),
-                        0.5 * f32::consts::PI,
-                    ),
-                },
-            ),
-        };
-
         Self {
             choir,
             render,
@@ -144,28 +142,71 @@ impl Game {
             in_camera_drag: false,
             last_mouse_pos: [0; 2],
             terrain_body,
+            terrain,
             car,
         }
     }
 
+    fn load_car(
+        loader: &mut Loader,
+        physics: &mut Physics,
+        car_path: &str,
+        transform: nalgebra::Isometry3<f32>,
+    ) -> Object {
+        log::info!("Loading car: {}", car_path);
+        let car_path = path::PathBuf::from("data/cars").join(car_path);
+        let car_config: config::Car = ron::de::from_bytes(
+            &fs::read(car_path.join("car.ron")).expect("Unable to open the car config"),
+        )
+        .expect("Unable to parse the car config");
+        let model_desc = Loader::read_gltf(
+            &car_path.join("body.glb"),
+            Matrix4::identity().scale(car_config.scale),
+        );
+        let model = loader.load_model(&model_desc);
+        let collider = Self::create_mesh_collider(model_desc, car_config.density);
+
+        let rigid_body = rapier3d::dynamics::RigidBodyBuilder::dynamic()
+            .position(transform)
+            .build();
+
+        let PhysicsBodyHandle {
+            rigid_body_handle, ..
+        } = physics.add_rigid_body(rigid_body, vec![collider]);
+        Object {
+            model_instance: ModelInstance {
+                model: Arc::new(model),
+                transform,
+            },
+            rigid_body: rigid_body_handle,
+        }
+    }
+
+    fn create_mesh_collider(model_desc: ModelDesc, density: f32) -> rapier3d::geometry::Collider {
+        rapier3d::geometry::ColliderBuilder::trimesh(model_desc.positions(), model_desc.indices())
+            .density(density)
+            .build()
+    }
+
     fn update_physics(&mut self) {
-        let mut objects = [&mut self.car.body];
+        let mut objects = [&mut self.car];
         for object in objects.iter_mut() {
             self.physics
                 .update_gravity(object.rigid_body, &self.terrain_body);
         }
         self.physics.step();
         for object in objects.iter_mut() {
-            object.transform = self.physics.get_transform(object.rigid_body);
+            object.model_instance.transform = self.physics.get_transform(object.rigid_body);
         }
     }
 
     fn redraw(&mut self) -> time::Duration {
         //TODO: detach from rendering
         self.update_physics();
 
-        let objects = [&self.car.body];
-        self.render.draw(&self.camera, &objects);
+        let model_instances = vec![&self.car.model_instance];
+        self.render
+            .draw(&self.camera, &self.terrain, &model_instances);
 
         time::Duration::from_millis(16)
     }
@@ -269,7 +310,7 @@ impl Drop for Game {
         }
         log::info!("Deinitializing");
         self.render.wait_for_gpu();
-        self.car.body.model.free(self.render.context());
+        self.car.model_instance.model.free(self.render.context());
         self.render.deinit();
     }
 }

bin/game/main.rs

@@ -0,0 +1,3 @@
+[
+    "root"
+]

data/packs/packs.ron

@@ -0,0 +1,34 @@
+[
+    (
+        id: "oxidize_monk",
+        scene_path: Some("entities/oxidize_monk/body.glb"),
+    ),
+    (
+        id: "cube",
+        scene_path: Some("entities/cube/cube.glb"),
+        physics: Some((
+            body: RigidBody(
+                mass: 1
+            ),
+            colliders: [(
+                shape: Box(size: (0.1, 0.1, 0.1)),
+                transform: ()
+            )]
+        ))
+    ),
+    (
+        id: "floor",
+        scene_path: Some("entities/floor/floor.glb"),
+        physics: Some((
+            body: StaticBody,
+            colliders: [(
+                shape: Box(size: (1.0, 0.02, 1.0)),
+                transform: ()
+            )]
+        ))
+    ),
+    (
+        id: "main_script",
+        script_path: Some("entities/main/script.lua")
+    )
+]

data/packs/root/entities.ron

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c475d845c85cb171ee4be1b6aa82c010e79a86cf14f7114c6053280f563a55bf
+size 2008

data/packs/root/entities/cube/cube.glb

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:baa52ef86b77a3b6faa0d4bbfbdb2db95717ef396e3c6b237f2f6c657e7732a4
+size 1972

data/packs/root/entities/floor/floor.glb

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d9d1557d54a35d39271cf148360c7464c0125a57dd6d4b7a204c508b533775c
+size 35660