Changeset 4904 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jul 19, 2005, 11:05:36 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: prepeared the CDEngine check for collision s with the ground. Flush work

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (2 diffs)
• lib/graphics/spatial_separation/quadtree.h (modified) (2 diffs)
• lib/graphics/spatial_separation/quadtree_node.h (modified) (1 diff)
• world_entities/terrain.cc (modified) (1 diff)

orxonox/trunk/src/lib/collision_detection/cd_engine.cc

@@ -61 +61 @@
 void CDEngine::checkCollisions()
 {
+  this->checkCollisionObjects();
+  this->checkCollisionGround();
+}
+
+
+
+void CDEngine::checkCollisionObjects()
+{
   tIterator<WorldEntity>* iterator1 = entityList->getIterator();
   tIterator<WorldEntity>* iterator2 = entityList->getIterator();
@@ -84 +92 @@
 
 
-
-void CDEngine::checkCollisionObjects()
-{}
+void CDEngine::checkCollisionGround()
+{
 
 
-void CDEngine::checkCollisionGround()
-{}
+}
 
 

orxonox/trunk/src/lib/graphics/spatial_separation/quadtree.h

@@ -15 +15 @@
 class QuadtreeNode;
 class Material;
+class Vector;
 
 //! A class for quadtree separation of the world
@@ -23 +24 @@
   virtual ~Quadtree();
 
+  QuadtreeNode* getQuadtreeFromPosition(const Vector& position);
+
   void drawTree(int depth, int drawMode) const;
-
   inline Material* getMaterial(int indexNode) const { return this->materials[indexNode % 4]; }
 

orxonox/trunk/src/lib/graphics/spatial_separation/quadtree_node.h

@@ -26 +26 @@
     QuadtreeNode(modelInfo* pModelInfo, Quadtree* quadtree, const int maxDepth);
     virtual ~QuadtreeNode();
+
+    float getHeight(const Vector& position);
 
     void drawTree(int depth, int drawMode) const;

orxonox/trunk/src/world_entities/terrain.cc

@@ -121 +121 @@
     this->model->draw();
   glPopMatrix();
+
+  this->ssp->drawQuadtree();
 }