Changeset 3653 in orxonox.OLD for orxonox/trunk

Timestamp:

Mar 25, 2005, 6:14:40 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now using iterator in world instead of old construct. on my pc, there is now a speedup of about 1 fps! (instead of 1fps i ve now 2fps )

Location:

orxonox/trunk/src

Files:

• lib/util/list.h (modified) (3 diffs)
• story_entities/world.cc (modified) (1 diff)

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

@@ -70 +70 @@
 
 template<class T>
-tIterator<T>::tIterator (listElement<T>* startElement) 
+inline tIterator<T>::tIterator (listElement<T>* startElement) 
 {
   this->currentEl = startElement;
@@ -92 +92 @@
       return NULL;
     }
+  if( this->currentEl == this->firstEl)
+    {
+      this->currentEl = this->currentEl->next;
+      return this->firstEl->curr;
+    }
   if( this->currentEl->next == NULL)
     return NULL;
-  return this->currentEl->next->curr;
+  this->currentEl = this->currentEl->next;
+  return this->currentEl->curr;
 }
 
@@ -247 +253 @@
 
 template<class T>
-tIterator<T>* tList<T>::getIterator()
+inline tIterator<T>* tList<T>::getIterator()
 {
   if( this->size == 0) return NULL;

orxonox/trunk/src/story_entities/world.cc

@@ -574 +574 @@
   glLoadIdentity();
 
-  entity = this->entities->enumerate();
+  //entity = this->entities->enumerate();
+  tIterator<WorldEntity>* iterator = this->entities->getIterator();
+  entity = iterator->nextElement();
   while( entity != NULL ) 
     { 
       if( entity->bDraw ) entity->draw();
-      entity = this->entities->nextElement();
-    } 
+      //entity = this->entities->nextElement();
+      entity = iterator->nextElement();
+    }
+  delete iterator;
   
   glCallList (objectList);