Changeset 8684 in orxonox.OLD for branches/terrain/src/world_entities/terrain_entity.cc

Timestamp:

Jun 21, 2006, 6:23:57 PM (18 years ago)

Author:

ponder

Message:

Tried to do the collision detection for the terrain.

File:

• branches/terrain/src/world_entities/terrain_entity.cc (modified) (2 diffs)

branches/terrain/src/world_entities/terrain_entity.cc

@@ -174 +174 @@
 
   /* translate */
- /* glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z );*/
+   glTranslatef( this->getAbsCoor().x,
+                 this->getAbsCoor().y,
+                 this->getAbsCoor().z );
   /* rotate */
   // Vector tmpRot = this->getAbsDir().getSpacialAxis();
@@ -397 +397 @@
 float TerrainEntity::getHeight( float x, float z )
 {
-        Triple altitude( x, 0.0f, z ), normal( 0.0f, 0.0f, 0.0f );
+        Triple  altitude( x-getAbsCoor().x, 0.0f, z-getAbsCoor().z ), 
+                        normal( 0.0f, 0.0f, 0.0f );
         if ( terrain )
                 terrain->getAltitude( altitude, normal );