Changeset 8715 in orxonox.OLD for branches/terrain/src/lib/collision_detection

Timestamp:

Jun 22, 2006, 1:51:50 PM (19 years ago)

Author:

ponder

Message:

• Added special checks for macosx to acinclude.m4 and configure.ac. This sucks
• Reapplied the endianness checks to the md2_model file. They got lost during the merge operation.
• Tried to do the collision detection for the ground. But somehow it doesn't work. Perhaps an offset will do.

File:

• branches/terrain/src/lib/collision_detection/cd_engine.cc (modified) (2 diffs)

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

@@ -24 +24 @@
 #include "model.h"
 #include "world_entity.h"
-#include "terrain.h"
+#include "terrain_entity.h"
 // #include "player.h"
 
@@ -104 +104 @@
   std::list<WorldEntity*>::iterator entityIterator;
   const std::list<BaseObject*>* bspList = ClassList::getList(CL_BSP_ENTITY);
-  if( bspList == NULL)
-    return;
+  if( bspList != NULL) {
 
-  // for all bsp managers check all entities
-  for( bspIterator = bspList->begin(); bspIterator != bspList->end(); bspIterator++) {
-      for(entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++)
-      {
-//         PRINTF(0)("Checking: %s a %s\n", (*entityIterator)->getName(), (*entityIterator)->getClassName());
-        (dynamic_cast<BspEntity*>(*bspIterator)->getBspManager())->checkCollision(*entityIterator);
+        // for all bsp managers check all entities
+        for( bspIterator = bspList->begin(); bspIterator != bspList->end(); bspIterator++) {
+        for(entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++)
+        {
+//               PRINTF(0)("Checking: %s a %s\n", (*entityIterator)->getName(), (*entityIterator)->getClassName());
+                (dynamic_cast<BspEntity*>(*bspIterator)->getBspManager())->checkCollision(*entityIterator);
+        }
+        }
+        }
+        const std::list<BaseObject*>* tl = ClassList::getList( CL_TERRAIN );
+  std::list<BaseObject*>::const_iterator ti;    
+        if ( tl == NULL )
+                return;
+        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 );
+                                }
       }
-  }
+        }
 }