Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix removed collider event not triggering #304

Merged
merged 1 commit into from
Nov 9, 2024
Merged

fix removed collider event not triggering #304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions src/rapier_wrapper/physics_world.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ pub struct PhysicsObjects {
pub collider_set: ColliderSet,
pub rigid_body_set: RigidBodySet,

pub removed_rigid_bodies_user_data: HashMap<RigidBodyHandle, UserData>,
pub removed_colliders_user_data: HashMap<ColliderHandle, UserData>,

pub handle: WorldHandle,
}
pub struct PhysicsWorld {
Expand All @@ -104,6 +107,9 @@ impl PhysicsWorld {
rigid_body_set: RigidBodySet::new(),
collider_set: ColliderSet::new(),

removed_rigid_bodies_user_data: HashMap::new(),
removed_colliders_user_data: HashMap::new(),

handle: WorldHandle::default(),
},
physics_pipeline,
Expand Down Expand Up @@ -293,6 +299,9 @@ impl PhysicsWorld {
}
}
}
// remove all the removed colliders and rigidbodies user data
self.physics_objects.removed_rigid_bodies_user_data.clear();
self.physics_objects.removed_colliders_user_data.clear();
}

pub fn insert_collider(
Expand All @@ -313,19 +322,31 @@ impl PhysicsWorld {
}

pub fn remove_collider(&mut self, collider_handle: ColliderHandle) {
self.physics_objects.collider_set.remove(
if let Some(collider) = self.physics_objects.collider_set.remove(
collider_handle,
&mut self.physics_objects.island_manager,
&mut self.physics_objects.rigid_body_set,
false,
);
) {
self.physics_objects
.removed_colliders_user_data
.insert(collider_handle, UserData::new(collider.user_data));
}
}

pub fn get_collider_user_data(&self, collider_handle: ColliderHandle) -> UserData {
let collider = self.physics_objects.collider_set.get(collider_handle);
if let Some(collider) = collider {
return UserData::new(collider.user_data);
}
// removed collider
if let Some(user_data) = self
.physics_objects
.removed_colliders_user_data
.get(&collider_handle)
{
return *user_data;
}
UserData::invalid_user_data()
}

Expand All @@ -339,21 +360,33 @@ impl PhysicsWorld {

pub fn remove_rigid_body(&mut self, body_handle: RigidBodyHandle) {
let rigid_body_handle = body_handle;
self.physics_objects.rigid_body_set.remove(
if let Some(rigid_body) = self.physics_objects.rigid_body_set.remove(
rigid_body_handle,
&mut self.physics_objects.island_manager,
&mut self.physics_objects.collider_set,
&mut self.physics_objects.impulse_joint_set,
&mut self.physics_objects.multibody_joint_set,
true,
);
) {
self.physics_objects
.removed_rigid_bodies_user_data
.insert(rigid_body_handle, UserData::new(rigid_body.user_data));
}
}

pub fn get_rigid_body_user_data(&self, rigid_body_handle: RigidBodyHandle) -> UserData {
let rigid_body = self.physics_objects.rigid_body_set.get(rigid_body_handle);
if let Some(rigid_body) = rigid_body {
return UserData::new(rigid_body.user_data);
}
// removed rigidbody
if let Some(user_data) = self
.physics_objects
.removed_rigid_bodies_user_data
.get(&rigid_body_handle)
{
return *user_data;
}
UserData::invalid_user_data()
}

Expand Down