diff options
Diffstat (limited to 'thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h')
-rw-r--r-- | thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h index 86c4151f8c..4c8a88cbda 100644 --- a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h +++ b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h @@ -20,43 +20,36 @@ subject to the following restrictions: #include "Bullet3Common/b3AlignedObjectArray.h" #include "Bullet3Common/b3Transform.h" - - - struct b3MyFace { - b3AlignedObjectArray<int> m_indices; - b3Scalar m_plane[4]; + b3AlignedObjectArray<int> m_indices; + b3Scalar m_plane[4]; }; -B3_ATTRIBUTE_ALIGNED16(class) b3ConvexUtility +B3_ATTRIBUTE_ALIGNED16(class) +b3ConvexUtility { - public: +public: B3_DECLARE_ALIGNED_ALLOCATOR(); - b3Vector3 m_localCenter; - b3Vector3 m_extents; - b3Vector3 mC; - b3Vector3 mE; - b3Scalar m_radius; - - b3AlignedObjectArray<b3Vector3> m_vertices; - b3AlignedObjectArray<b3MyFace> m_faces; + b3Vector3 m_localCenter; + b3Vector3 m_extents; + b3Vector3 mC; + b3Vector3 mE; + b3Scalar m_radius; + + b3AlignedObjectArray<b3Vector3> m_vertices; + b3AlignedObjectArray<b3MyFace> m_faces; b3AlignedObjectArray<b3Vector3> m_uniqueEdges; - b3ConvexUtility() { } virtual ~b3ConvexUtility(); - bool initializePolyhedralFeatures(const b3Vector3* orgVertices, int numVertices, bool mergeCoplanarTriangles=true); - - void initialize(); - bool testContainment() const; - - + bool initializePolyhedralFeatures(const b3Vector3* orgVertices, int numVertices, bool mergeCoplanarTriangles = true); + void initialize(); + bool testContainment() const; }; #endif -
\ No newline at end of file |