Changeset 246 for code/branches/objecthierarchie/src/Identifier.h

Timestamp:

Nov 25, 2007, 7:19:54 PM (16 years ago)

Author:

landauf

Message:

added "MetaObjectList", containing the list-element of the ObjectList of all classes an object is registered in. this allowes much faster deleting of objects.

File:

• code/branches/objecthierarchie/src/Identifier.h (modified) (4 diffs)

code/branches/objecthierarchie/src/Identifier.h

@@ -8 +8 @@
 #include "Factory.h"
 
-#define HIERARCHY_VERBOSE true
+#define HIERARCHY_VERBOSE false
 
 
@@ -30 +30 @@
 
         public:
-            virtual void removeObject(OrxonoxClass* object) const = 0;
-            virtual void removeObjectIntern(OrxonoxClass* object, bool bIterateForwards) const = 0;
-
             inline void addFactory(BaseFactory* factory) { this->factory_ = factory; }
             BaseObject* fabricate();
@@ -93 +90 @@
             static ClassIdentifier<T>* getIdentifier();
             static void addObject(T* object);
-            void removeObject(OrxonoxClass* object) const;
-            void removeObjectIntern(OrxonoxClass* object, bool bIterateForwards) const;
 
         private:
@@ -172 +167 @@
         std::cout << "*** Added object to " << ClassIdentifier<T>::getIdentifier()->getName() << "-list.\n";
 #endif
-        ClassIdentifier<T>::getIdentifier()->objects_->add(object);
-    }
-
-    template <class T>
-    void ClassIdentifier<T>::removeObject(OrxonoxClass* object) const
-    {
-        bool bIterateForwards = !Identifier::isCreatingHierarchy();
-
-        this->removeObjectIntern(object, bIterateForwards);
-
-        IdentifierListElement* temp = this->parents_.first_;
-        while (temp)
-        {
-            temp->identifier_->removeObjectIntern(object, bIterateForwards);
-            temp = temp->next_;
-        }
-    }
-
-    template <class T>
-    void ClassIdentifier<T>::removeObjectIntern(OrxonoxClass* object, bool bIterateForwards) const
-    {
-#if HIERARCHY_VERBOSE
-        if (bIterateForwards)
-            std::cout << "*** Removed object from " << this->name_ << "-list, iterating forwards.\n";
-        else
-            std::cout << "*** Removed object from " << this->name_ << "-list, iterating backwards.\n";
-#endif
-
-        this->objects_->remove(object, bIterateForwards);
+        object->getMetaList()->add(ClassIdentifier<T>::getIdentifier()->objects_, ClassIdentifier<T>::getIdentifier()->objects_->add(object));
     }