Changeset 1574 for code/branches/core3/src/core/Identifier.cc

Timestamp:

Jun 9, 2008, 4:35:38 AM (16 years ago)

Author:

landauf

Message:

big change in ObjectList: separated the class into a non-template base and a template wrapper for the base. this also changes the Iterator, there is now a non-template IteratorBase. this brings much more flexibility, like iterating through all objects of a given identifier without knowing the type. however this needs a dynamic_cast, which isn't quite optimal, but I think there are much worser things than that out there.

there isn't much you have to know about this, except there is no more ObjectList<myClass>::start() function but a ObjectList<myClass>::begin() to be more STLish. another thing: ObjectList<myClass>::end() points now to the element _after_ the last element, so it's possible to iterate in a for-loop until (it != ObjectList<myClass>::end()). the reason is the same as above. however, (it) as a boolean still works perfectly fine.

File:

• code/branches/core3/src/core/Identifier.cc (modified) (3 diffs)

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

@@ -39 +39 @@
 #include "ConsoleCommand.h"
 #include "CommandExecutor.h"
+#include "MetaObjectList.h"
+#include "ObjectList.h"
+#include "OrxonoxClass.h"
 
 namespace orxonox
@@ -52 +55 @@
     Identifier::Identifier()
     {
+        this->objects_ = new ObjectListBase(this);
+
         this->bCreatedOneObject_ = false;
         this->factory_ = 0;
@@ -174 +179 @@
 
     /**
+        @brief Adds an object of the given type to the ObjectList.
+        @param object The object to add
+    */
+    void Identifier::addObject(OrxonoxClass* object)
+    {
+        COUT(5) << "*** ClassIdentifier: Added object to " << this->getName() << "-list." << std::endl;
+        object->getMetaList().add(this->objects_, this->objects_->add(object));
+    }
+
+    /**
         @brief Returns true, if the Identifier is at least of the given type.
         @param identifier The identifier to compare with