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

Simplify removal logic system #391

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Simplify removal logic system #391

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6a32fc
Simplify removal logic system
Aceeri Jul 5, 2023
af0b330
Just use if let Some rather than map
Aceeri Jul 5, 2023
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
63 changes: 20 additions & 43 deletions src/plugin/systems.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,11 +1090,12 @@ pub fn sync_removals(
mut removed_rigid_body_disabled: RemovedComponents<RigidBodyDisabled>,
mut removed_colliders_disabled: RemovedComponents<ColliderDisabled>,
) {
let context = &mut *context;

/*
* Rigid-bodies removal detection.
*/
let context = &mut *context;
for entity in removed_bodies.iter() {
for entity in removed_bodies.iter().chain(orphan_bodies.iter()) {
if let Some(handle) = context.entity2body.remove(&entity) {
let _ = context.last_body_transform_set.remove(&handle);
context.bodies.remove(
Expand All @@ -1106,78 +1107,54 @@ pub fn sync_removals(
false,
);
}
}

let context = &mut *context;
for entity in orphan_bodies.iter() {
if let Some(handle) = context.entity2body.remove(&entity) {
let _ = context.last_body_transform_set.remove(&handle);
context.bodies.remove(
handle,
&mut context.islands,
&mut context.colliders,
&mut context.impulse_joints,
&mut context.multibody_joints,
false,
);
if let Some(mut entity) = commands.get_entity(entity) {
entity.remove::<RapierRigidBodyHandle>();
}
commands.entity(entity).remove::<RapierRigidBodyHandle>();
}

/*
* Collider removal detection.
*/
for entity in removed_colliders.iter() {
for entity in removed_colliders.iter().chain(orphan_colliders.iter()) {
if let Some(handle) = context.entity2collider.remove(&entity) {
context
.colliders
.remove(handle, &mut context.islands, &mut context.bodies, true);
context.deleted_colliders.insert(handle, entity);
}
}

for entity in orphan_colliders.iter() {
if let Some(handle) = context.entity2collider.remove(&entity) {
context
.colliders
.remove(handle, &mut context.islands, &mut context.bodies, true);
context.deleted_colliders.insert(handle, entity);
if let Some(mut entity) = commands.get_entity(entity) {
entity.remove::<RapierColliderHandle>();
}
commands.entity(entity).remove::<RapierColliderHandle>();
}

/*
* Impulse joint removal detection.
*/
for entity in removed_impulse_joints.iter() {
for entity in removed_impulse_joints
.iter()
.chain(orphan_impulse_joints.iter())
{
if let Some(handle) = context.entity2impulse_joint.remove(&entity) {
context.impulse_joints.remove(handle, true);
}
}

for entity in orphan_impulse_joints.iter() {
if let Some(handle) = context.entity2impulse_joint.remove(&entity) {
context.impulse_joints.remove(handle, true);
if let Some(mut entity) = commands.get_entity(entity) {
entity.remove::<RapierImpulseJointHandle>();
}
commands.entity(entity).remove::<RapierImpulseJointHandle>();
}

/*
* Multibody joint removal detection.
*/
for entity in removed_multibody_joints.iter() {
for entity in removed_multibody_joints
.iter()
.chain(orphan_multibody_joints.iter())
{
if let Some(handle) = context.entity2multibody_joint.remove(&entity) {
context.multibody_joints.remove(handle, true);
}
}

for entity in orphan_multibody_joints.iter() {
if let Some(handle) = context.entity2multibody_joint.remove(&entity) {
context.multibody_joints.remove(handle, true);
if let Some(mut entity) = commands.get_entity(entity) {
entity.remove::<RapierMultibodyJointHandle>();
}
commands
.entity(entity)
.remove::<RapierMultibodyJointHandle>();
}

/*
Expand Down