Changeset 8690 in orxonox.OLD

Timestamp:

Jun 21, 2006, 11:29:30 PM (18 years ago)

Author:

ponder

Message:

 

Location:

branches/terrain/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (2 diffs)
• story_entities/game_world_data.cc (modified) (1 diff)
• world_entities/terrain_entity.cc (modified) (2 diffs)

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

@@ -87 +87 @@
             tree->collideWith(*entity1, *entity2);
         }
+                else {
+                        this->checkCollisionGround( list1 );
+                }
       }
     }
+        else {
+                this->checkCollisionGround( list2 );
+        }
   }
 }
@@ -98 +104 @@
 void CDEngine::checkCollisionGround(std::list<WorldEntity*>& list1)
 {
-  if( likely( this->terrain != NULL))
+  if( likely( this->terrain != NULL ) )
   {
-        //kraus: TODO put collision detection for terrain class here...
         TerrainEntity *ground = dynamic_cast<TerrainEntity*>(this->terrain);
-    //Quadtree* q = dynamic_cast<TerrainEntity*>(this->terrain)->ssp->getQuadtree();
-        //QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
     std::list<WorldEntity*>::iterator iterator;
-    PRINTF(3)("checking for collisions\n");
-
+    PRINTF(2)("checking for collisions\n");
     iterator = list1.begin();
     while ( iterator != list1.end() ) {
                 const Vector& position = (*iterator)->getAbsCoor();
-
-                float height = ground->getHeight( position.x, position.z );
-                PRINTF(2)( "height: %f\n", height );            
+                float height = ground->getHeight( position.x, position.z );             
                 if ( position.y < height )
                         (*iterator)->setAbsCoor( position.x, height, position.z );

branches/terrain/src/story_entities/game_world_data.cc

@@ -208 +208 @@
       }
                 
-      if( element->Value() == "Terrain" && created->isA(CL_TERRAIN))
+      if( element->Value() == "TerrainEntity" && created->isA(CL_TERRAIN))
       {
         this->terrain = dynamic_cast<TerrainEntity*>(created);

branches/terrain/src/world_entities/terrain_entity.cc

@@ -177 +177 @@
                  this->getAbsCoor().y,
                  this->getAbsCoor().z );
-  /* rotate */
-  // Vector tmpRot = this->getAbsDir().getSpacialAxis();
-  //glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-
-  /*if (this->objectList)
-    glCallList(this->objectList);
-  else if (this->getModel())
-    this->getModel()->draw();
-
-  if (this->vegetation)
-    this->vegetation->draw();
-*/
 
         Vector cam = State::getCameraNode()->getAbsCoor();
@@ -402 +390 @@
                 terrain->getAltitude( altitude, normal );
                 
-  return altitude.y;
-}
+  return altitude.y+getAbsCoor().y;
+}