Merge pull request #306 from janhohenheim/misc-fixes

.github/workflows/ci.yml

@@ -56,5 +56,8 @@ jobs:
         run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
       - name: Check format
         run: cargo fmt --all -- --check
-      - name: Run clippy with native dev features
+      - name: Run clippy with dev features
         run: cargo clippy
+      - name: Run clippy without dev features
+        run: cargo clippy --no-default-features
+

Cargo.toml

@@ -45,8 +45,7 @@ bevy_egui = "0.25"
 oxidized_navigation = { version = "0.10", features = ["xpbd", "debug_draw"] }
 iyes_progress = "0.11"
 leafwing-input-manager = { version = "0.13", features = ["egui"] }
-## Waiting for https://github.com/BlackPhlox/bevy_dolly/pull/51
-bevy_dolly = { git = "https://github.com/rparrett/bevy_dolly/", branch = "bevy-0.13" }
+bevy_dolly = "0.0.3"
 bevy_mod_sysfail = "7"
 bevy_editor_pls = { version = "0.8.1", optional = true }
 bevy_hanabi = "0.10"
@@ -61,10 +60,6 @@ warbler_grass = "0.6"
 bevy_gltf_blueprints = { version = "0.9", git = "https://github.com/janhohenheim/Blender_bevy_components_workflow", branch = "fix-crashe" }
 bevy_registry_export = "0.3"
 
-[patch."https://github.com/rparrett/bevy_dolly/"]
-## Waiting for https://github.com/BlackPhlox/bevy_dolly/pull/51
-dolly = { git = "https://github.com/janhohenheim/dolly", branch = "bevy-0.13" }
-
 [build-dependencies]
 embed-resource = "2"
 

src/movement/character_controller/models.rs

@@ -1,12 +1,17 @@
 use crate::movement::character_controller::FloatHeight;
+use crate::GameState;
+use bevy::transform::TransformSystem;
 use bevy::{prelude::*, render::view::NoFrustumCulling};
 use bevy_tnua::controller::TnuaController;
 use bevy_xpbd_3d::prelude::*;
 
 pub(super) fn plugin(app: &mut App) {
     app.add_systems(
         Update,
-        prepare_models_of_controllers.after(PhysicsSet::Sync),
+        prepare_models_of_controllers
+            .after(PhysicsSet::Sync)
+            .before(TransformSystem::TransformPropagate)
+            .run_if(in_state(GameState::Playing)),
     );
 }
 
@@ -18,7 +23,7 @@ fn prepare_models_of_controllers(
     meshes: Query<&Handle<Mesh>>,
 ) {
     for (entity, transform, float_height) in controllers.iter() {
-        // Shift models down because XPBD will make controllers float,
+        // Shift models down because Tnua will make controllers float,
         // but our models definitely should not be floating!
         let offset = (float_height.0 / transform.scale.y) * 2.;
         let children = children_q.get(entity).unwrap();

src/player_control/camera.rs

@@ -9,6 +9,7 @@ use crate::{
     GameState,
 };
 use bevy::prelude::*;
+use bevy::transform::TransformSystem;
 use bevy_atmosphere::prelude::AtmospherePlugin;
 use bevy_dolly::prelude::Dolly;
 use bevy_xpbd_3d::PhysicsSet;
@@ -76,6 +77,7 @@ pub(super) fn plugin(app: &mut App) {
                 .chain()
                 .in_set(CameraUpdateSystemSet)
                 .after(PhysicsSet::Sync)
+                .before(TransformSystem::TransformPropagate)
                 .run_if(in_state(GameState::Playing))
                 .run_if(any_with_component::<Player>),
         );