nichkara/rapier
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename rigid-body static to fixed

Browse Source
This commit is contained in:
Sébastien Crozet
2022-03-19 16:23:09 +01:00
committed by Sébastien Crozet
parent db6a8c526d
commit a9e3441ecd
87 changed files with 284 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src_testbed/graphics.rs
View File

@@ -170,11 +170,11 @@ impl GraphicsManager {
&mut self,
materials: &mut Assets<BevyMaterial>,
handle: RigidBodyHandle,
is_static: bool,
is_fixed: bool,
) -> Point3<f32> {
let mut color = self.ground_color;
if !is_static {
if !is_fixed {
match self.b2color.get(&handle).cloned() {
Some(c) => color = c,
None => color = Self::gen_color(&mut self.rand),

8
src_testbed/physx_backend.rs
View File

@@ -213,7 +213,7 @@ impl PhysxWorld {
rapier2dynamic.insert(rapier_handle, actor);
} else {
let actor = physics.create_static(pos, ()).unwrap();
let actor = physics.create_fixed(pos, ()).unwrap();
rapier2static.insert(rapier_handle, actor);
}
}
@@ -231,7 +231,7 @@ impl PhysxWorld {
let rb_handle = link.rigid_body_handle();
let rb = bodies.get(rb_handle).unwrap();
if is_root && rb.is_static() {
if is_root && rb.is_fixed() {
articulation.set_articulation_flag(ArticulationFlag::FixBase, true);
}
@@ -382,7 +382,7 @@ impl PhysxWorld {
);
for (_, actor) in rapier2static {
scene.add_static_actor(actor);
scene.add_fixed_actor(actor);
}
for (_, actor) in rapier2dynamic {
@@ -712,7 +712,7 @@ type PxPhysicsFoundation = PhysicsFoundation<DefaultAllocator, PxShape>;
type PxMaterial = physx::material::PxMaterial<()>;
type PxShape = physx::shape::PxShape<(), PxMaterial>;
type PxArticulationLink = physx::articulation_link::PxArticulationLink<RigidBodyHandle, PxShape>;
type PxRigidStatic = physx::rigid_static::PxRigidStatic<(), PxShape>;
type PxRigidStatic = physx::rigid_fixed::PxRigidStatic<(), PxShape>;
type PxRigidDynamic = physx::rigid_dynamic::PxRigidDynamic<RigidBodyHandle, PxShape>;
type PxArticulation = physx::articulation::PxArticulation<(), PxArticulationLink>;
type PxArticulationReducedCoordinate =

4
src_testbed/testbed.rs
View File

@@ -668,7 +668,7 @@ impl<'a, 'b, 'c, 'd, 'e, 'f> Testbed<'a, 'b, 'c, 'd, 'e, 'f> {
.physics
.bodies
.iter()
.filter(|e| !e.1.is_static())
.filter(|e| !e.1.is_fixed())
.map(|e| e.0)
.collect();
let num_to_delete = (dynamic_bodies.len() / 10).max(1);
@@ -773,7 +773,7 @@ impl<'a, 'b, 'c, 'd, 'e, 'f> Testbed<'a, 'b, 'c, 'd, 'e, 'f> {
//
// let collider = ColliderBuilder::cuboid(4.0, 2.0, 0.4).density(20.0).build();
// // let collider = ColliderBuilder::ball(2.0).density(1.0).build();
// let body = RigidBodyBuilder::new_dynamic()
// let body = RigidBodyBuilder::dynamic()
// .position(cam_pos)
// .linvel(vel.x, vel.y, vel.z)
// .ccd_enabled(true)