Changeset 4694 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 24, 2005, 6:10:13 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now ready to implement the collision detection algorithm

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (1 diff)
• lib/util/list.h (modified) (4 diffs)
• subprojects/collision_detection/collision_detection.cc (modified) (2 diffs)

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

@@ -59 +59 @@
   tIterator<WorldEntity>* iterator2 = entityList->getIterator();
   WorldEntity* entity1 = iterator1->nextElement();
-  WorldEntity* entity2 = iterator2->nextElement();
+  WorldEntity* entity2 = iterator2->seekElement(entity1);
+  printf("checking for collisions\n");
   while( entity1 != NULL)
   {
-    while( entity2 != NULL && entity1 != entity2)
+    printf("entering l1\n");
+    while( entity2 != NULL)
     {
+      printf("entering l2 - checking object %s against %s\n", entity1->getName(), entity2->getName());
       entity1->collideWith(entity2);
       entity2 = iterator2->nextElement();
+
     }
     entity1 = iterator1->nextElement();
+    entity2 = iterator2->seekElement(entity1);
+
   }
   delete iterator1;
   delete iterator2;
-
-
 }
 

orxonox/trunk/src/lib/util/list.h

@@ -34 +34 @@
 
   T* nextElement();
+  T* seekElement(T* element);
 
  private:
   listElement<T>*    currentEl;                      //!< pointer to the current list element in the iterator
   listElement<T>*    tmpEl;                          //!< temp listElemnt pointer
+  listElement<T>*    startElement;                   //!< pointer to the start of the list
 };
 
@@ -61 +63 @@
   this->currentEl = startElement;
   this->tmpEl = NULL;
+  this->startElement = startElement;
 }
 
@@ -87 +90 @@
   this->currentEl = this->currentEl->next;
   return this->tmpEl->curr;
+}
+
+/**
+   \brief gets the element after the selected one, sets the iterator to this point in the list
+   \param element the element to seek
+   \returns next list element
+
+  Attention: if you seek an element, the iterator pointer will point to the NEXT listelement after the argument!
+ */
+template<class T>
+inline T* tIterator<T>::seekElement (T* element)
+{
+  for(this->tmpEl = this->startElement; this->tmpEl != NULL; this->tmpEl = this->tmpEl->next)
+  {
+    if( unlikely(this->tmpEl->curr == element))
+    {
+      if( this->tmpEl->next != NULL)
+      {
+        this->currentEl = this->tmpEl->next->next;
+        return this->tmpEl->next->curr;
+      }
+      return NULL;
+    }
+  }
+  return NULL;
 }
 
@@ -109 +137 @@
   bool isEmpty();
   int getSize();
-  //T* enumerate();
   bool inList(T* entity);
   tIterator<T>* getIterator();

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

@@ -65 +65 @@
   entityList = new tList<WorldEntity>();
 
-  TestEntity* a = new TestEntity();
-  Environment* b = new Environment();
+  TestEntity* a = new TestEntity(); a->setName("Clown1");
+  Environment* b = new Environment(); b->setName("Jaeger");
   b->setRelCoor(0.0, 0.0, -10.0);
+
+  TestEntity* c = new TestEntity(); c->setName("Colwn2");
+  c->setRelCoor(0.0, 0.0, -20.0);
 
   entityList->add(a);
   entityList->add(b);
+  entityList->add(c);
 
   CDEngine::getInstance()->setEntityList(entityList);
@@ -205 +209 @@
   dt = currentFrame - lastFrame;
 
-  if( dt > 10)
+  if( dt > 0)
   {
     float fps = 1000/dt;
 
           // temporary, only for showing how fast the text-engine is
-    char tmpChar[20];
-    sprintf(tmpChar, "fps: %4.0f", fps);
+    printf("we got %f fps\n", fps);
   }
   else