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

made some improvements based on feedback.

Browse Source 
- made getHeightFieldValue virtual (allows custom heightfield formats)
- don't use shorts, just full integers (no reason to limit the terrain size to 65536)
This commit is contained in:
ejcoumans
2007-06-28 20:40:54 +00:00
parent e34083551c
commit 114bfad68f
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
View File

@@ -77,8 +77,6 @@ m_flipQuadEdges(flipQuadEdges)
m_localAabbMax = halfExtents + clampValue; m_localAabbMax = halfExtents + clampValue;
btVector3 aabbSize = m_localAabbMax - m_localAabbMin; btVector3 aabbSize = m_localAabbMax - m_localAabbMin;
m_quantization = btVector3(btScalar(65535.0),btScalar(65535.0),btScalar(65535.0)) / aabbSize;
} }
@@ -118,6 +116,7 @@ btScalar btHeightfieldTerrainShape::getHeightFieldValue(int x,int y) const
val = m_heightfieldDataFloat[(y*m_width)+x]; val = m_heightfieldDataFloat[(y*m_width)+x];
} else } else
{ {
//assume unsigned short int
unsigned char heightFieldValue = m_heightfieldDataUnsignedChar[(y*m_width)+x]; unsigned char heightFieldValue = m_heightfieldDataUnsignedChar[(y*m_width)+x];
val = heightFieldValue* (m_maxHeight/btScalar(65535)); val = heightFieldValue* (m_maxHeight/btScalar(65535));
} }
@@ -180,7 +179,7 @@ void btHeightfieldTerrainShape::getVertex(int x,int y,btVector3& vertex) const
} }
void btHeightfieldTerrainShape::quantizeWithClamp(short* out, const btVector3& point) const void btHeightfieldTerrainShape::quantizeWithClamp(int* out, const btVector3& point) const
{ {
@@ -190,9 +189,9 @@ void btHeightfieldTerrainShape::quantizeWithClamp(short* out, const btVector3& p
btVector3 v = (clampedPoint );// * m_quantization; btVector3 v = (clampedPoint );// * m_quantization;
out[0] = (short)(v.getX()); out[0] = (int)(v.getX());
out[1] = (short)(v.getY()); out[1] = (int)(v.getY());
out[2] = (short)(v.getZ()); out[2] = (int)(v.getZ());
//correct for //correct for
} }
@@ -206,8 +205,8 @@ void btHeightfieldTerrainShape::processAllTriangles(btTriangleCallback* callback
//quantize the aabbMin and aabbMax, and adjust the start/end ranges //quantize the aabbMin and aabbMax, and adjust the start/end ranges
short quantizedAabbMin[3]; int quantizedAabbMin[3];
short quantizedAabbMax[3]; int quantizedAabbMax[3];
btVector3 localAabbMin = aabbMin*btVector3(1.f/m_localScaling[0],1.f/m_localScaling[1],1.f/m_localScaling[2]); btVector3 localAabbMin = aabbMin*btVector3(1.f/m_localScaling[0],1.f/m_localScaling[1],1.f/m_localScaling[2]);
btVector3 localAabbMax = aabbMax*btVector3(1.f/m_localScaling[0],1.f/m_localScaling[1],1.f/m_localScaling[2]); btVector3 localAabbMax = aabbMax*btVector3(1.f/m_localScaling[0],1.f/m_localScaling[1],1.f/m_localScaling[2]);

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

@@ -32,7 +32,7 @@ protected:
union union
{ {
unsigned char* m_heightfieldDataUnsignedChar; unsigned char* m_heightfieldDataUnsignedChar;
float* m_heightfieldDataFloat; btScalar* m_heightfieldDataFloat;
void* m_heightfieldDataUnknown; void* m_heightfieldDataUnknown;
}; };
@@ -41,15 +41,13 @@ protected:
int m_upAxis; int m_upAxis;
btVector3 m_quantization;
btVector3 m_localScaling; btVector3 m_localScaling;
btScalar getHeightFieldValue(int x,int y) const; virtual btScalar getHeightFieldValue(int x,int y) const;
void quantizeWithClamp(short* out, const btVector3& point) const; void quantizeWithClamp(int* out, const btVector3& point) const;
void getVertex(int x,int y,btVector3& vertex) 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 inline bool testQuantizedAabbAgainstQuantizedAabb(int* aabbMin1, int* aabbMax1,const int* aabbMin2,const int* aabbMax2) const
{ {
bool overlap = true; bool overlap = true;
overlap = (aabbMin1[0] > aabbMax2[0] || aabbMax1[0] < aabbMin2[0]) ? false : overlap; overlap = (aabbMin1[0] > aabbMax2[0] || aabbMax1[0] < aabbMin2[0]) ? false : overlap;