diff --git a/assets/character/Russian_soldier_last.glb b/assets/character/Russian_soldier_last.glb new file mode 100644 index 0000000..742e048 Binary files /dev/null and b/assets/character/Russian_soldier_last.glb differ diff --git a/assets/character/main_character.glb b/assets/character/main_character.glb index 42f7cc6..746d34e 100644 Binary files a/assets/character/main_character.glb and b/assets/character/main_character.glb differ diff --git a/src/comps/core/markers/proxy/physics/rapier.rs b/src/comps/core/markers/proxy/physics/rapier.rs index 40db6fc..72711bc 100644 --- a/src/comps/core/markers/proxy/physics/rapier.rs +++ b/src/comps/core/markers/proxy/physics/rapier.rs @@ -18,7 +18,7 @@ pub enum Collider { #[derive(Component, Reflect, Default, Debug)] #[reflect(Component)] -pub enum RigidBody { +pub enum RigidBodyBlender { #[default] Fixed, Dynamic, @@ -42,8 +42,8 @@ pub fn physics_replace_proxies( (Without, Added), >, proxy_rigidbodies: Query< - (Entity, &RigidBody), - (Without, Added), + (Entity, &RigidBodyBlender), + (Without, Added), >, // needed for tri meshes children: Query<&Children>, @@ -105,10 +105,11 @@ pub fn physics_replace_proxies( } } for (entity, proxy_rigidbody) in proxy_rigidbodies.iter() { + println!("A"); let rapier_rigidbody: RapierRigidBody; match proxy_rigidbody { - RigidBody::Fixed => rapier_rigidbody = RapierRigidBody::Fixed, - RigidBody::Dynamic => rapier_rigidbody = RapierRigidBody::Dynamic, + RigidBodyBlender::Fixed => rapier_rigidbody = RapierRigidBody::Fixed, + RigidBodyBlender::Dynamic => rapier_rigidbody = RapierRigidBody::Dynamic, } commands .entity(entity) diff --git a/src/comps/core/markers/proxy/plugin.rs b/src/comps/core/markers/proxy/plugin.rs index d567ecc..a2d7a26 100644 --- a/src/comps/core/markers/proxy/plugin.rs +++ b/src/comps/core/markers/proxy/plugin.rs @@ -22,7 +22,7 @@ impl Plugin for ProxyComponentsPlugin { // Physics app.register_type::(); app.register_type::(); - app.register_type::(); + app.register_type::(); app.add_systems(Update, (physics_replace_proxies, update_game_load_state)); } } \ No newline at end of file