Changeset 1591 for code/branches/core3/src/core/Identifier.h

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/Identifier.h (modified) (7 diffs)

code/branches/core3/src/core/Identifier.h

@@ -60 +60 @@
 #include <utility>
 
-#include "Iterator.h"
+#include "MetaObjectList.h"
+#include "ObjectListBase.h"
 #include "util/Debug.h"
 #include "util/String.h"
@@ -103 +104 @@
             bool isDirectParentOf(const Identifier* identifier) const;
 
-            void addObject(OrxonoxClass* object);
-
             /** @brief Returns the list of all existing objects of this class. @return The list */
             inline ObjectListBase* getObjects() const
@@ -113 +112 @@
             void setName(const std::string& name);
 
-            virtual void updateConfigValues() const = 0;
+            void updateConfigValues() const;
 
             /** @brief Returns the parents of the class the Identifier belongs to. @return The list of all parents */
@@ -231 +230 @@
 
             bool bCreatedOneObject_;                                       //!< True if at least one object of the given type was created (used to determine the need of storing the parents)
+            ObjectListBase* objects_;                                      //!< The list of all objects of this class
 
         private:
@@ -264 +264 @@
             bool bSetName_;                                                //!< True if the name is set
             std::string name_;                                             //!< The name of the class the Identifier belongs to
-            ObjectListBase* objects_;                                      //!< The list of all objects of this class
             BaseFactory* factory_;                                         //!< The Factory, able to create new objects of the given class (if available)
             static int hierarchyCreatingCounter_s;                         //!< Bigger than zero if at least one Identifier stores its parents (its an int instead of a bool to avoid conflicts with multithreading)
@@ -301 +300 @@
             void initializeClassHierarchy(std::set<const Identifier*>* parents, bool bRootClass);
             static bool isFirstCall();
-
-            void updateConfigValues() const;
+            void addObject(T* object);
 
             XMLPortParamContainer* getXMLPortParamContainer(const std::string& paramname);
@@ -411 +409 @@
 
     /**
-        @brief Updates the config-values of all existing objects of this class by calling their setConfigValues() function.
-    */
-    template <class T>
-    void ClassIdentifier<T>::updateConfigValues() const
-    {
-        for (Iterator<T> it = this->getObjects()->begin(); it; ++it)
-            (*it)->setConfigValues();
+        @brief Adds an object of the given type to the ObjectList.
+        @param object The object to add
+    */
+    template <class T>
+    void ClassIdentifier<T>::addObject(T* object)
+    {
+        COUT(5) << "*** ClassIdentifier: Added object to " << this->getName() << "-list." << std::endl;
+        object->getMetaList().add(this->objects_, this->objects_->add(new ObjectListElement<T>(object)));
     }