Move ColliderShape out of Rapier.

This commit is contained in:
Crozet Sébastien
2021-01-22 18:10:54 +01:00
parent b779eb261e
commit 57072f3ba7
7 changed files with 49 additions and 435 deletions

View File

@@ -1,6 +1,6 @@
use na::{Isometry3, Point3};
use rapier3d::dynamics::{JointSet, RigidBodyBuilder, RigidBodySet};
use rapier3d::geometry::{ColliderBuilder, ColliderSet, ColliderShape};
use rapier3d::geometry::{ColliderBuilder, ColliderSet, SharedShape};
use rapier_testbed3d::Testbed;
pub fn init_world(testbed: &mut Testbed) {
@@ -66,15 +66,15 @@ pub fn init_world(testbed: &mut Testbed) {
let shapes = vec![
(
Isometry3::identity(),
ColliderShape::cuboid(rad * 10.0, rad, rad),
SharedShape::cuboid(rad * 10.0, rad, rad),
),
(
Isometry3::translation(rad * 10.0, rad * 10.0, 0.0),
ColliderShape::cuboid(rad, rad * 10.0, rad),
SharedShape::cuboid(rad, rad * 10.0, rad),
),
(
Isometry3::translation(-rad * 10.0, rad * 10.0, 0.0),
ColliderShape::cuboid(rad, rad * 10.0, rad),
SharedShape::cuboid(rad, rad * 10.0, rad),
),
];

View File

@@ -3,7 +3,7 @@ use na::{Point3, Translation3};
use rapier3d::cdl::bounding_volume::{self, BoundingVolume};
use rapier3d::cdl::transformation::vhacd::{VHACDParameters, VHACD};
use rapier3d::dynamics::{JointSet, RigidBodyBuilder, RigidBodySet};
use rapier3d::geometry::{ColliderBuilder, ColliderSet, ColliderShape};
use rapier3d::geometry::{ColliderBuilder, ColliderSet, SharedShape};
use rapier_testbed3d::Testbed;
use std::path::Path;
@@ -82,11 +82,11 @@ pub fn init_world(testbed: &mut Testbed) {
.map(|idx| [idx.x, idx.y, idx.z])
.collect();
let decomposed_shape = ColliderShape::convex_decomposition(&vertices, &indices);
let decomposed_shape = SharedShape::convex_decomposition(&vertices, &indices);
shapes.push(decomposed_shape);
}
// let compound = ColliderShape::compound(compound_parts);
// let compound = SharedShape::compound(compound_parts);
for k in 1..num_duplications + 1 {
let x = (igeom % width) as f32 * shift;

View File

@@ -1,6 +1,6 @@
use na::{ComplexField, DMatrix, Isometry3, Point3, Vector3};
use rapier3d::dynamics::{JointSet, RigidBodyBuilder, RigidBodySet};
use rapier3d::geometry::{ColliderBuilder, ColliderSet, ColliderShape};
use rapier3d::geometry::{ColliderBuilder, ColliderSet, SharedShape};
use rapier_testbed3d::Testbed;
pub fn init_world(testbed: &mut Testbed) {
@@ -70,15 +70,15 @@ pub fn init_world(testbed: &mut Testbed) {
let shapes = vec![
(
Isometry3::identity(),
ColliderShape::cuboid(rad, rad / 2.0, rad / 2.0),
SharedShape::cuboid(rad, rad / 2.0, rad / 2.0),
),
(
Isometry3::translation(rad, 0.0, 0.0),
ColliderShape::cuboid(rad / 2.0, rad, rad / 2.0),
SharedShape::cuboid(rad / 2.0, rad, rad / 2.0),
),
(
Isometry3::translation(-rad, 0.0, 0.0),
ColliderShape::cuboid(rad / 2.0, rad, rad / 2.0),
SharedShape::cuboid(rad / 2.0, rad, rad / 2.0),
),
];

View File

@@ -1,6 +1,6 @@
use na::{ComplexField, DMatrix, Isometry3, Point3, Vector3};
use rapier3d::dynamics::{JointSet, RigidBodyBuilder, RigidBodySet};
use rapier3d::geometry::{ColliderBuilder, ColliderSet, ColliderShape, HeightField};
use rapier3d::geometry::{ColliderBuilder, ColliderSet, HeightField, SharedShape};
use rapier_testbed3d::Testbed;
pub fn init_world(testbed: &mut Testbed) {
@@ -75,15 +75,15 @@ pub fn init_world(testbed: &mut Testbed) {
let shapes = vec![
(
Isometry3::identity(),
ColliderShape::cuboid(rad, rad / 2.0, rad / 2.0),
SharedShape::cuboid(rad, rad / 2.0, rad / 2.0),
),
(
Isometry3::translation(rad, 0.0, 0.0),
ColliderShape::cuboid(rad / 2.0, rad, rad / 2.0),
SharedShape::cuboid(rad / 2.0, rad, rad / 2.0),
),
(
Isometry3::translation(-rad, 0.0, 0.0),
ColliderShape::cuboid(rad / 2.0, rad, rad / 2.0),
SharedShape::cuboid(rad / 2.0, rad, rad / 2.0),
),
];