Changeset 8741 in orxonox.OLD for branches/terrain/src/lib/collision_detection/cd_engine.cc

Timestamp:

Jun 23, 2006, 11:29:40 AM (18 years ago)

Author:

ponder

Message:

• Finally, I got the terrain working completly. What a hard work… It took me lots and lots of hours to remove all bugs in the tesselation routines.

File:

• branches/terrain/src/lib/collision_detection/cd_engine.cc (modified) (1 diff)

branches/terrain/src/lib/collision_detection/cd_engine.cc

@@ -119 +119 @@
         if ( tl == NULL )
                 return;
+        float offset = 8.0f;
         for ( ti = tl->begin(); ti != tl->end(); ++ti ) {
                         TerrainEntity* terrain = dynamic_cast<TerrainEntity*>( *ti );
       for( entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++ )
                 {
-                                const Vector& pos = (*entityIterator)->getAbsCoor();
-                                
-                                float height = terrain->getHeight( pos.x, pos.z );
-                                printf( "pos.y-height: %f\n", pos.y-height );
-                                if ( height > pos.y ) {
-                                        (*entityIterator)->setAbsCoor( pos.x, height, pos.z );
+                                Vector pos( (*entityIterator)->getAbsCoor() );
+                                Vector normal;
+                                float height = pos.y;
+                                terrain->getAltitude( pos, normal );
+                                if ( height-offset < pos.y ) {
+                                        ( *entityIterator )->registerCollision( 
+                                                *entityIterator, terrain, pos, normal );
                                 }
       }