Changeset 4711 in orxonox.OLD

Timestamp:

Jun 26, 2005, 10:17:03 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now the displayer show the data in an appropriate form

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• subprojects/collision_detection/collision_detection.cc (modified) (2 diffs)

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

@@ -840 +840 @@
   if( drawMode & DRAW_BV_POLYGON || drawMode & DRAW_ALL || drawMode & DRAW_BV_BLENDED)
   {
-    if(this->nodeLeft == NULL && this->nodeRight == NULL)
+    if(this->nodeLeft == NULL || this->nodeRight == NULL)
       depth = 0;
     if( !(drawMode & DRAW_SINGLE && depth != 0))

orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -79 +79 @@
   entityList = new tList<WorldEntity>();
 
-  a = new TestEntity(); a->setName("Clown1");
-  b = new Environment(); a->setName("Clown");
+   a = new TestEntity(); a->setName("Clown1");
+   b = new Environment(); a->setName("Clown");
   //b = new Environment(); b->setName("Jaeger");
   //c = new Terrain();
 
-  b->setRelCoor(0.0, 0.0, -10.0);
+   b->setRelCoor(0.0, 0.0, -10.0);
   //b->setRelDir(Quaternion(-M_PI/2.0f, Vector(0.0, 1.0, 0.0)));
 
-  entityList->add(a);
-  entityList->add(b);
+   entityList->add(a);
+   entityList->add(b);
 
   CDEngine::getInstance()->setEntityList(entityList);
@@ -248 +248 @@
 void Framework::moduleDraw() const
 {
-  //CDEngine::getInstance()->debugDraw(depth, drawMode);
+  CDEngine::getInstance()->debugDraw(depth, drawMode);
 
   tIterator<WorldEntity>* iterator = entityList->getIterator();