diff options
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h index 78e231e08e6..4a7a4a4bda4 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h @@ -68,7 +68,7 @@ subject to the following restrictions: For usage and testing see the TerrainDemo. */ -class btHeightfieldTerrainShape : public btConcaveShape +ATTRIBUTE_ALIGNED16(class) btHeightfieldTerrainShape : public btConcaveShape { protected: btVector3 m_localAabbMin; @@ -93,7 +93,8 @@ protected: PHY_ScalarType m_heightDataType; bool m_flipQuadEdges; - bool m_useDiamondSubdivision; + bool m_useDiamondSubdivision; + bool m_useZigzagSubdivision; int m_upAxis; @@ -116,6 +117,9 @@ protected: PHY_ScalarType heightDataType, bool flipQuadEdges); public: + + BT_DECLARE_ALIGNED_ALLOCATOR(); + /// preferred constructor /** This constructor supports a range of heightfield @@ -142,6 +146,8 @@ public: void setUseDiamondSubdivision(bool useDiamondSubdivision=true) { m_useDiamondSubdivision = useDiamondSubdivision;} + ///could help compatibility with Ogre heightfields. See https://code.google.com/p/bullet/issues/detail?id=625 + void setUseZigzagSubdivision(bool useZigzagSubdivision=true) { m_useZigzagSubdivision = useZigzagSubdivision;} virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const; |