Changeset 4708 in orxonox.OLD for orxonox/trunk/src/subprojects/collision_detection

Timestamp:

Jun 26, 2005, 6:51:31 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: the cd now supports rotations in the detection

File:

• orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc (modified) (5 diffs)

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

@@ -44 +44 @@
 bool drawModel;
 
-TestEntity* a;
+Environment* a;
 Environment* b;
 
@@ -69 +69 @@
   entityList = new tList<WorldEntity>();
 
-  a = new TestEntity(); a->setName("Clown1");
-  //a = new Environment(); a->setName("Clown");
+  //a = new TestEntity(); a->setName("Clown1");
+  a = new Environment(); a->setName("Clown");
   b = new Environment(); b->setName("Jaeger");
+
   b->setRelCoor(0.0, 0.0, -10.0);
+  b->setRelDir(Quaternion(-M_PI/2.0f, Vector(0.0, 1.0, 0.0)));
 
 //   TestEntity* c = new TestEntity(); c->setName("Colwn2");
@@ -79 +81 @@
   entityList->add(a);
   entityList->add(b);
-//   entityList->add(c);
 
   CDEngine::getInstance()->setEntityList(entityList);
@@ -225 +226 @@
 
 
-  tIterator<WorldEntity>* iterator = entityList->getIterator(); /* get the iterator - JAVA style */
-  WorldEntity* entity = iterator->nextElement();   /* this returns the FIRST element */
-  while( entity != NULL)                        /* nextElement() will return NULL at the end */
+  tIterator<WorldEntity>* iterator = entityList->getIterator();
+  WorldEntity* entity = iterator->nextElement();
+  while( entity != NULL)
   {
     entity->tick(dt);
-    entity = iterator->nextElement();       /* give back the next element or NULL if last */
+    entity = iterator->nextElement();
   }
   delete iterator;
@@ -238 +239 @@
 void Framework::moduleDraw() const
 {
-  //CDEngine::getInstance()->drawBV(depth, drawMode);
-
-  tIterator<WorldEntity>* iterator = entityList->getIterator(); /* get the iterator - JAVA style */
-  WorldEntity* entity = iterator->nextElement();   /* this returns the FIRST element */
-  while( entity != NULL)                        /* nextElement() will return NULL at the end */
+  tIterator<WorldEntity>* iterator = entityList->getIterator();
+  WorldEntity* entity = iterator->nextElement();
+  while( entity != NULL)
   {
     if( likely(drawModel))
     entity->draw();
     entity->drawBVTree(depth, drawMode);
-    entity = iterator->nextElement();       /* give back the next element or NULL if last */
+    entity = iterator->nextElement();
   }
   delete iterator;