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

update to rapier 0.33

Browse Source
This commit is contained in:
Dmitry Stepanov
2026-06-14 22:17:47 +03:00
parent 6c4eda4010
commit d179d10e50
6 changed files with 61 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fyrox-impl/Cargo.toml
+4 -4
View File
@@ -27,8 +27,8 @@ fyrox-graphics-gl = { path = "../fyrox-graphics-gl", version = "2.0.0-rc.1" }
fyrox-texture = { path = "../fyrox-texture", version = "2.0.0-rc.1" }
fyrox-autotile = { path = "../fyrox-autotile", version = "2.0.0-rc.1" }
fyrox-material = { path = "../fyrox-material", version = "2.0.0-rc.1" }
rapier2d = { version = "0.32", features = ["debug-render", ] }
rapier3d = { version = "0.32", features = ["debug-render"] }
rapier2d = { version = "0.33", features = ["debug-render", ] }
rapier3d = { version = "0.33", features = ["debug-render"] }
image = { version = "0.25.1", default-features = false, features = ["gif", "jpeg", "png", "tga", "tiff", "bmp"] }
inflate = "0.4.5"
serde = { version = "1", features = ["derive"] }
@@ -43,8 +43,8 @@ clap = { version = "4", features = ["derive"] }
winit = { version = "0.30", features = ["serde"] }
half = { version = "2.2.1", features = ["bytemuck"] }
base64 = "0.22.1"
uvgen = "0.4.0"
lightmap = "0.6.0"
uvgen = "0.5.0"
lightmap = "0.7.0"
libloading = "0.9"
gltf = { version = "1.4.0", default-features = false, features = ["names", "utils", "extras", "KHR_materials_emissive_strength"] }
bytemuck = { version = "1.23.2", features = ["derive"] }
fyrox-impl/src/scene/dim2/physics.rs
+27 -12
View File
@@ -1267,16 +1267,6 @@ impl PhysicsWorld {
}
if let Some(native) = self.joints.set.get_mut(joint.native.get(), false) {
joint.body1.try_sync_model(|v| {
if let Ok(rigid_body_node) = nodes.try_get(v) {
native.body1 = rigid_body_node.native.get();
}
});
joint.body2.try_sync_model(|v| {
if let Ok(rigid_body_node) = nodes.try_get(v) {
native.body2 = rigid_body_node.native.get();
}
});
joint.params.try_sync_model(|v| {
native.data =
// Preserve local frames.
@@ -1307,11 +1297,11 @@ impl PhysicsWorld {
// wake up the bodies connected to the joint to ensure they respond to the motor changes immediately
// however, the rigid bodies may fall asleep any time later unless Joint::set_motor_* functions are called periodically,
// or the rigid bodies are set to cannot sleep
let Some(body1) = self.bodies.get_mut(native.body1) else {
let Some(body1) = self.bodies.get_mut(native.body1()) else {
return;
};
body1.wake_up(true);
let Some(body2) = self.bodies.get_mut(native.body2) else {
let Some(body2) = self.bodies.get_mut(native.body2()) else {
return;
};
body2.wake_up(true);
@@ -1319,6 +1309,7 @@ impl PhysicsWorld {
joint.contacts_enabled.try_sync_model(|v| {
native.data.set_contacts_enabled(v);
});
let mut local_frames = joint.local_frames.borrow_mut();
if local_frames.is_none() {
if let (Ok(body1), Ok(body2)) =
@@ -1330,6 +1321,30 @@ impl PhysicsWorld {
*local_frames = Some(JointLocalFrames::new(&local_frame1, &local_frame2));
}
}
joint.body1.try_sync_model(|v| {
if let (Ok(rigid_body_node1), Ok(rigid_body_node2)) =
(nodes.try_get(v), nodes.try_get(*joint.body2))
{
self.joints.set.set_bodies(
joint.native.get(),
rigid_body_node1.native.get(),
rigid_body_node2.native.get(),
false,
);
}
});
joint.body2.try_sync_model(|v| {
if let (Ok(rigid_body_node2), Ok(rigid_body_node1)) =
(nodes.try_get(v), nodes.try_get(*joint.body1))
{
self.joints.set.set_bodies(
joint.native.get(),
rigid_body_node1.native.get(),
rigid_body_node2.native.get(),
false,
);
}
});
} else {
let body1_handle = joint.body1();
let body2_handle = joint.body2();
fyrox-impl/src/scene/graph/physics.rs
+26 -14
View File
@@ -1786,18 +1786,7 @@ impl PhysicsWorld {
joint.native.set(ImpulseJointHandle(Default::default()));
return;
}
if let Some(native) = self.joints.set.get_mut(joint.native.get(), false) {
joint.body1.try_sync_model(|v| {
if let Ok(rigid_body_node) = nodes.try_get(v) {
native.body1 = rigid_body_node.native.get();
}
});
joint.body2.try_sync_model(|v| {
if let Ok(rigid_body_node) = nodes.try_get(v) {
native.body2 = rigid_body_node.native.get();
}
});
joint.params.try_sync_model(|v| {
native.data =
// Preserve local frames.
@@ -1831,11 +1820,11 @@ impl PhysicsWorld {
// wake up the bodies connected to the joint to ensure they respond to the motor changes immediately
// however, the rigid bodies may fall asleep any time later unless Joint::set_motor_* functions are called periodically,
// or the rigid bodies are set to cannot sleep
let Some(body1) = self.bodies.get_mut(native.body1) else {
let Some(body1) = self.bodies.get_mut(native.body1()) else {
return;
};
body1.wake_up(true);
let Some(body2) = self.bodies.get_mut(native.body2) else {
let Some(body2) = self.bodies.get_mut(native.body2()) else {
return;
};
body2.wake_up(true);
@@ -1843,7 +1832,6 @@ impl PhysicsWorld {
joint.contacts_enabled.try_sync_model(|v| {
native.data.set_contacts_enabled(v);
});
let mut local_frames = joint.local_frames.borrow_mut();
if local_frames.is_none() {
if let (Ok(body1), Ok(body2)) =
@@ -1855,6 +1843,30 @@ impl PhysicsWorld {
*local_frames = Some(JointLocalFrames::new(&local_frame1, &local_frame2));
}
}
joint.body1.try_sync_model(|v| {
if let (Ok(rigid_body_node1), Ok(rigid_body_node2)) =
(nodes.try_get(v), nodes.try_get(*joint.body2))
{
self.joints.set.set_bodies(
joint.native.get(),
rigid_body_node1.native.get(),
rigid_body_node2.native.get(),
false,
);
}
});
joint.body2.try_sync_model(|v| {
if let (Ok(rigid_body_node2), Ok(rigid_body_node1)) =
(nodes.try_get(v), nodes.try_get(*joint.body1))
{
self.joints.set.set_bodies(
joint.native.get(),
rigid_body_node1.native.get(),
rigid_body_node2.native.get(),
false,
);
}
});
} else {
let body1_handle = joint.body1();
let body2_handle = joint.body2();