FyroxEngine/Fyrox
1
0
Fork 0
mirror of https://github.com/FyroxEngine/Fyrox.git synced 2026-10-12 02:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed potential crash when a joint is synced before its rigid bodies

Browse Source
This commit is contained in:
Dmitry Stepanov
2025-10-15 22:42:14 +03:00
parent fbfdf3a09d
commit 09320a0658
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fyrox-impl/src/scene/dim2/physics.rs
+12 -6
View File
@@ -1313,6 +1313,18 @@ impl PhysicsWorld {
if let (Some(body1), Some(body2)) =
(nodes.try_get(body1_handle), nodes.try_get(body2_handle))
{
let native_body1 = body1.native.get();
let native_body2 = body2.native.get();
if self.bodies.get(native_body1).is_none()
|| self.bodies.get(native_body2).is_none()
{
// A joint may be synced before the connected bodies, this way the connected
// rigid bodies does not have native rigid bodies, and in this case we should
// simply skip the joint and initialize it on the next frame.
return;
}
// Calculate local frames first (if needed).
let mut local_frames = joint.local_frames.borrow_mut();
let (local_frame1, local_frame2) = local_frames
@@ -1335,12 +1347,6 @@ impl PhysicsWorld {
})
.unwrap_or_else(|| calculate_local_frames(joint, body1, body2));
let native_body1 = body1.native.get();
let native_body2 = body2.native.get();
assert!(self.bodies.get(native_body1).is_some());
assert!(self.bodies.get(native_body2).is_some());
let mut native_joint = convert_joint_params(params, local_frame1, local_frame2);
native_joint.contacts_enabled = joint.is_contacts_enabled();
let native_handle =
fyrox-impl/src/scene/graph/physics.rs
+12 -3
View File
@@ -1886,6 +1886,18 @@ impl PhysicsWorld {
.try_get(body2_handle)
.filter(|b| self.bodies.get(b.native.get()).is_some()),
) {
let native_body1 = body1.native.get();
let native_body2 = body2.native.get();
if self.bodies.get(native_body1).is_none()
|| self.bodies.get(native_body2).is_none()
{
// A joint may be synced before the connected bodies, this way the connected
// rigid bodies does not have native rigid bodies, and in this case we should
// simply skip the joint and initialize it on the next frame.
return;
}
// Calculate local frames first (if needed).
let mut local_frames = joint.local_frames.borrow_mut();
let (local_frame1, local_frame2) = local_frames
@@ -1908,9 +1920,6 @@ impl PhysicsWorld {
})
.unwrap_or_else(|| calculate_local_frames(joint, body1, body2));
let native_body1 = body1.native.get();
let native_body2 = body2.native.get();
let mut native_joint = convert_joint_params(params, local_frame1, local_frame2);
native_joint.contacts_enabled = joint.is_contacts_enabled();
let native_handle =