Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow for float data, and prepare for 'quad edge flip', either re-use the first triangle vertex, or second (re-use index 00 or 01)

Browse Source
This commit is contained in:
ejcoumans
2007-06-27 19:56:18 +00:00
parent 9099d6bed5
commit cad28a8b35
3 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
View File

@@ -29,15 +29,25 @@ protected:
int m_width;
int m_length;
btScalar m_maxHeight;
unsigned char* m_heightfieldData;
union
{
unsigned char* m_heightfieldDataUnsignedChar;
float* m_heightfieldDataFloat;
void* m_heightfieldDataUnknown;
};
bool m_useFloatData;
bool m_flipQuadEdges;
int m_upAxis;
btVector3 m_quantization;
btVector3 m_localScaling;
void quantizeWithClamp(short* out, const btVector3& point) const;
void getVertex(int x,int y,btVector3& vertex) const;
btScalar getHeightFieldValue(int x,int y) const;
void quantizeWithClamp(short* out, const btVector3& point) const;
void getVertex(int x,int y,btVector3& vertex) const;
inline bool testQuantizedAabbAgainstQuantizedAabb(short int* aabbMin1,short int* aabbMax1,const short int* aabbMin2,const short int* aabbMax2) const
{
@@ -49,7 +59,7 @@ protected:
}
public:
btHeightfieldTerrainShape(int width,int height,unsigned char* heightfieldData, btScalar maxHeight,int upAxis);
btHeightfieldTerrainShape(int width,int height,void* heightfieldData, btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges);
virtual ~btHeightfieldTerrainShape();