Add content pack system #7

lpenguin · 2025-01-01T21:23:12Z

Notable changes:

Few commits to refactor core render and physics modules for content pack system
All code related to content packs system is placed under content_packs workspace member. This should probably be moved somewhere else and should replace bin/game in the future.
Currently event consuming is broken: frames are rendered every 16ms, but other input events are being ignored for some reason. The approach in bin/game/main.rs is not working also: frames are rendered without any pauses. Probably there should another timer system implemented, need input from @kvark.
I switched to the default gravity in physics.step (so I don't apply forces directly to each rigidbody), as I've seen no harm in doing that.

Key concepts of content pack system:

Entity - describe available game objects. Currently there's only one type of entity: Object (visual + physics + scripts). I plan to and Mechoses and Tabutasks.
Level - container for entities plus terrain
Content Pack: combines entities and levels. Currently there's only one root pack (under data/packs/root), but I plan to add a system to support additional packs that can override and extend root pack.
Some structs:
- ObjectDesc - description of the object, read from RON file.
- ObjectTemplate - preloaded object ready for instantiation in a level.
- Object - object instance

kvark · 2025-01-03T06:14:57Z

I switched to the default gravity in physics.step (so I don't apply forces directly to each rigidbody), as I've seen no harm in doing that.

We can't use the default gravity since our gravity direction is non-uniform: instead of always being down, it's directed towards the 0-Z axis.

Entity - describe available game objects. Currently there's only one type of entity: Object (visual + physics + scripts). I plan to and Mechoses and Tabutasks.

If there are different types, we might want to use an ECS in here, such as hecs.

lpenguin · 2025-01-03T11:42:09Z

We can't use the default gravity since our gravity direction is non-uniform: instead of always being down, it's directed towards the 0-Z axis.

Ah, right, good point

If there are different types, we might want to use an ECS in here, such as hecs.

That's a good suggestion, but currently it will be an overkill in my view. Let's think about it later with more entities added.

lpenguin · 2025-01-06T20:24:09Z

Currently event consuming is broken: frames are rendered every 16ms, but other input events are being ignored for some reason. The approach in bin/game/main.rs is not working also: frames are rendered without any pauses. Probably there should another timer system implemented, need input from @kvark.

Fixed in last commits

lpenguin · 2025-01-06T20:25:46Z

src/physics.rs

@@ -105,7 +100,7 @@ impl Physics {
        terrain: &TerrainBody,
    ) {
        //Note: real world power is -11, but our scales are different
-        const GRAVITY: f32 = 6.6743e-8;
+        const GRAVITY: f32 = 1e-3;


For some reason the working magic number is 1e-3, at least my demo cubes fall and collide more or less realistically

kvark

That's a very solid contribution, thank you!
Just a few questions to resolve before we land this

kvark · 2025-01-10T04:54:27Z

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["lib/ffi"]
+members = ["lib/ffi", "lib/content_packs"]


did you consider dashes instead of underscores for file names?

kvark · 2025-01-10T04:55:55Z

lib/content_packs/src/camera_controller.rs

+}
+
+impl CameraController {
+    pub fn new(camera: Camera) -> CameraController {


nit: ->Self

kvark · 2025-01-10T04:56:37Z

lib/content_packs/src/camera_controller.rs

+        }
+    }
+
+    pub fn camera(&self) -> &Camera {


would it be easier to just expose the camera field as pub?

kvark · 2025-01-10T04:57:15Z

lib/content_packs/src/content_pack.rs

+            let entry = entry.unwrap();
+            let path = entry.path();
+            if let Some(ext) = path.extension() {
+                if ext == "ron" {


should we assert if it's not "ron"? just ignoring it doesn't sound polite

kvark · 2025-01-10T04:58:27Z

lib/content_packs/src/definitions.rs

+
+
+
+


nit: a bunch of empty lines?

did you run cargo fmt on the project?

kvark · 2025-01-10T04:59:16Z

lib/content_packs/src/game.rs

@@ -0,0 +1,230 @@
+use std::collections::{HashMap, HashSet};


formatting: I really like to have a single use statement per crate, e.g.

use std::{fs, time, {f32::consts::PI}, path::Path, sync::Arc};

Can we have that here please?

kvark · 2025-01-10T04:59:45Z

lib/content_packs/src/game.rs

+pub struct QuitEvent;
+
+impl Game {
+    pub fn new(event_loop: &EventLoop<()>, mods_directory: &Path) -> Game {


nit: -> Self

kvark · 2025-01-10T05:00:57Z

lib/ffi/Cargo.toml

@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 vandals-and-heroes = { path = "../.." }
 raw-window-handle = "0.6.2"
-log = "0.4.22"
+log = "0.4"


do we still need the FFI? I was hoping you'd be comfortable with Rust modules by now

lpenguin added 4 commits January 1, 2025 20:47

Refactor model loading

d1c7fae

Move terrain data out of Renderer

52a6ab2

Support multiple colliders

373f51c

Content packs

aff643b

lpenguin marked this pull request as draft January 2, 2025 07:37

lpenguin added 2 commits January 6, 2025 21:21

Fix update problem

e3840b9

Cylinder gravity

5e31a4c

lpenguin commented Jan 6, 2025

View reviewed changes

lpenguin marked this pull request as ready for review January 7, 2025 12:55

lpenguin changed the title ~~WIP: Add content pack system~~ Add content pack system Jan 7, 2025

kvark reviewed Jan 10, 2025

View reviewed changes

lpenguin added 5 commits January 11, 2025 09:13

cargo fmt

79643c6

Prettify code

4db7036

Assert level file ends with ".ron"

475be47

Rename "content_packs" to "content-packs"

7403e33

Rename remove "vangers-ffi"

8c8791c

kvark approved these changes Jan 19, 2025

View reviewed changes

kvark merged commit d0a5c94 into kvark:main Jan 19, 2025
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add content pack system #7

Add content pack system #7

lpenguin commented Jan 1, 2025 •

edited

Loading

kvark commented Jan 3, 2025

lpenguin commented Jan 3, 2025 •

edited

Loading

lpenguin commented Jan 6, 2025

lpenguin Jan 6, 2025

kvark left a comment

kvark Jan 10, 2025

kvark Jan 10, 2025

kvark Jan 10, 2025

kvark Jan 10, 2025

kvark Jan 10, 2025

kvark Jan 10, 2025

kvark Jan 10, 2025

kvark Jan 10, 2025

Add content pack system #7

Add content pack system #7

Conversation

lpenguin commented Jan 1, 2025 • edited Loading

kvark commented Jan 3, 2025

lpenguin commented Jan 3, 2025 • edited Loading

lpenguin commented Jan 6, 2025

Choose a reason for hiding this comment

kvark left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lpenguin commented Jan 1, 2025 •

edited

Loading

lpenguin commented Jan 3, 2025 •

edited

Loading