Changeset 3654 in orxonox.OLD

Timestamp:

Mar 25, 2005, 6:47:26 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: altered the list function to make it more performant the world now uses iterators everywhere.

Location:

orxonox/trunk/src

Files:

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

orxonox/trunk/src/command_node.cc

@@ -281 +281 @@
   if( this->world->command(cmd)) return;
 
-  WorldEntity* entity = bound->enumerate();
+  tIterator<WorldEntity>* iterator = bound->getIterator();
+  WorldEntity* entity = iterator->nextElement();
   while( entity != NULL)
     {
       entity->command (cmd); /*no absorbtion of command! strange*/
-      entity = bound->nextElement();
-    }
+      entity = iterator->nextElement();
+    }
+  delete iterator;
 }
 

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

@@ -87 +87 @@
 inline T* tIterator<T>::nextElement ()
 {
-  if( this->currentEl == NULL)
-    {
-      PRINTF(1)("Iterator has not been initialized - there is no currentEl\n");
+  if( this->currentEl == NULL || this->currentEl->next == NULL) /* don't turn it the other way or it will give segfaults! */
       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->firstEl->curr; /* if its the first element, don't return second element*/
+    }
   this->currentEl = this->currentEl->next;
   return this->currentEl->curr;
@@ -126 +121 @@
 
  private:
-
   Uint32 size;
   listElement<T>* first;
   listElement<T>* last;
   listElement<T>* currentEl;
-
 };
 
@@ -255 +248 @@
 inline tIterator<T>* tList<T>::getIterator()
 {
-  if( this->size == 0) return NULL;
   tIterator<T>* iterator = new tIterator<T>(this->first);
   return iterator;

orxonox/trunk/src/story_entities/world.cc

@@ -755 +755 @@
       
       /* function to let all entities tick (iterate through list) */
-      WorldEntity* entity;
       float seconds = this->dt / 1000.0;      
       this->gameTime += seconds;
-      entity = entities->enumerate(); 
+      //entity = entities->enumerate(); 
+      tIterator<WorldEntity>* iterator = this->entities->getIterator();
+      WorldEntity* entity = iterator->nextElement();
       while( entity != NULL) 
         { 
           entity->tick (seconds);
-          entity = entities->nextElement();
+          entity = iterator->nextElement();
         }
+      delete iterator;
       //skySphere->updatePosition(localCamera->absCoordinate);
       

orxonox/trunk/src/world_entities/player.cc

@@ -207 +207 @@
       PRINTF(1)("changing the weapon of the player: deactivate old, activate new\n");
       this->activeWeapon->deactivate();
-      this->weapons->enumerate(); 
+      //this->weapons->enumerate();  FIX: strang weapon change...
       this->activeWeapon = this->weapons->nextElement(this->activeWeapon);
       this->activeWeapon->activate();