Changeset 1591 for code/branches/core3/src/core/ObjectListBase.cc

Timestamp:

Jun 12, 2008, 2:00:15 AM (16 years ago)

Author:

landauf

Message:

Again some heavy changes in ObjectList and Iterator:
there are now two types of iterators:

Iterator<ClassName> can iterate through any objectlist, either given by ObjectList<AnyClassName>::begin() or anyidentifier→getObjects()→begin(). Important note Iterator<ClassName> uses dynamic_cast.
And yes, it's possible to do this: Iterator<WorldEntity> it = ObjectList<SpaceShip>::begin()

ObjectList<ClassName>::iterator is the second iterator - it uses the ObjectList in a templated manner and therefore doesn't need dynamic_cast. But the only thing you can do is iterating through exactly the right ObjectList: ObjectList<ClassName>::iterator it = ObjectList<ClassName>::begin(). Anything else fails.

Those changes bring, at my system, something around +12% FPS compared with trunk and +25% FPS compared with the last revision of core3. Although I have to admit the FPS gain is only that high because iterating through objects is the main thing we're doing ingame right now. It would look totally different with physics, sound, AI, scripts, triggers and so on.

File:

• code/branches/core3/src/core/ObjectListBase.cc (modified) (4 diffs)

code/branches/core3/src/core/ObjectListBase.cc

@@ -41 +41 @@
 #include "ObjectListBase.h"
 #include "Identifier.h"
-#include "IteratorBase.h"
+#include "Iterator.h"
 
 namespace orxonox
@@ -73 +73 @@
         @param element The element that gets removed
     */
-    void ObjectListBase::notifyIterators(ObjectListBaseElement* element)
+    void ObjectListBase::notifyIterators(OrxonoxClass* object) const
     {
-        for (std::set<IteratorBase*>::iterator it = this->iterators_.begin(); it != this->iterators_.end(); ++it)
-            if ((*(*(*it))) == element->object_)
-                ++(*(*it));
+        for (std::list<void*>::const_iterator it = this->iterators_.begin(); it != this->iterators_.end(); ++it)
+            ((Iterator<OrxonoxClass>*)(*it))->incrementIfEqual(object);
+        for (std::list<void*>::const_iterator it = this->objectListIterators_.begin(); it != this->objectListIterators_.end(); ++it)
+            ((ObjectListIterator<OrxonoxClass>*)(*it))->incrementIfEqual(object);
     }
 
@@ -85 +86 @@
         @return The pointer to the new ObjectListBaseElement, needed by the MetaObjectList of the added object
     */
-    ObjectListBaseElement* ObjectListBase::add(OrxonoxClass* object)
+    ObjectListBaseElement* ObjectListBase::add(ObjectListBaseElement* element)
     {
         if (!this->last_)
         {
             // If the list is empty
-            this->last_ = new ObjectListBaseElement(object);
+            this->last_ = element;
             this->first_ = this->last_; // There's only one object in the list now
         }
@@ -97 +98 @@
             // If the list isn't empty
             ObjectListBaseElement* temp = this->last_;
-            this->last_ = new ObjectListBaseElement(object);
+            this->last_ = element;
             this->last_->prev_ = temp;
             temp->next_ = this->last_;