Changeset 2908 for code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (modified) (8 diffs)

code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp

@@ -145 +145 @@
 }
 
-
-/// This returns the "raw" (user's initial) height, not the actual height.
-/// The actual height needs to be adjusted to be relative to the center
-///   of the heightfield's AABB.
-btScalar
-btHeightfieldTerrainShape::getRawHeightFieldValue(int x,int y) const
+btScalar        btHeightfieldTerrainShape::getHeightFieldValue(int x,int y) const
 {
         btScalar val = 0.f;
@@ -187 +182 @@
 
 
-/// this returns the vertex in bullet-local coordinates
+
 void    btHeightfieldTerrainShape::getVertex(int x,int y,btVector3& vertex) const
 {
+
         btAssert(x>=0);
         btAssert(y>=0);
@@ -195 +191 @@
         btAssert(y<m_heightStickLength);
 
-        btScalar        height = getRawHeightFieldValue(x,y);
+
+        btScalar        height = getHeightFieldValue(x,y);
 
         switch (m_upAxis)
@@ -202 +199 @@
                 {
                 vertex.setValue(
-                        height - m_localOrigin.getX(),
+                        height,
                         (-m_width/btScalar(2.0)) + x,
                         (-m_length/btScalar(2.0) ) + y
@@ -212 +209 @@
                         vertex.setValue(
                         (-m_width/btScalar(2.0)) + x,
-                        height - m_localOrigin.getY(),
+                        height,
                         (-m_length/btScalar(2.0)) + y
                         );
@@ -222 +219 @@
                         (-m_width/btScalar(2.0)) + x,
                         (-m_length/btScalar(2.0)) + y,
-                        height - m_localOrigin.getZ()
+                        height
                         );
                         break;
@@ -234 +231 @@
 
         vertex*=m_localScaling;
+        
 }
 
@@ -241 +239 @@
 getQuantized
 (
-btScalar x
+float x
 )
 {