Changeset 219 for code/branches/objecthierarchie/src/IdentifierIncludes.h

Timestamp:

Nov 19, 2007, 10:10:11 PM (16 years ago)

Author:

landauf

Message:

• removed the "ClassHierarchy" manager-class and put its sole feature (bIsCreatingClassHierarchy_) directly into the Identifier.

• added a dynamic_cast from OrxonoxClass to BaseObject to the Factory. OrxonoxClass is needed because several classes use Interfaces, but all classes are derived at least from BaseObject, so the cast will work.

File:

• code/branches/objecthierarchie/src/IdentifierIncludes.h (modified) (2 diffs)

code/branches/objecthierarchie/src/IdentifierIncludes.h

@@ -1 @@
-#include "ClassHierarchy.h"
 #include "Identifier.h"
 #include "Factory.h"
@@ -5 +4 @@
 #include "ObjectList.h"
 #include "OrxonoxClass.h"
+
+
+#define registerRootObject(ClassName) \
+    std::cout << "*** Register Root-Object: " << #ClassName << "\n"; \
+    if (Identifier::isCreatingHierarchy() && !this->getParents()) \
+        this->setParents(new IdentifierList()); \
+    if (this->getIdentifier()) \
+        this->getIdentifier()->removeObject(this); \
+    this->setIdentifier(ClassIdentifier<ClassName>::registerClass(this->getParents(), #ClassName, true, false)); \
+    if (Identifier::isCreatingHierarchy() && this->getParents()) \
+        this->getParents()->add(this->getIdentifier()); \
+    this->getIdentifier()->addObject(this)
+
+#define registerAbstractRootObject(ClassName) \
+    std::cout << "*** Register Root-Object: " << #ClassName << "\n"; \
+    if (Identifier::isCreatingHierarchy() && !this->getParents()) \
+        this->setParents(new IdentifierList()); \
+    if (this->getIdentifier()) \
+        this->getIdentifier()->removeObject(this); \
+    this->setIdentifier(ClassIdentifier<ClassName>::registerClass(this->getParents(), #ClassName, true, true)); \
+    if (Identifier::isCreatingHierarchy() && this->getParents()) \
+        this->getParents()->add(this->getIdentifier()); \
+    this->getIdentifier()->addObject(this)
+
+#define registerObject(ClassName) \
+    std::cout << "*** Register Object: " << #ClassName << "\n"; \
+    this->getIdentifier()->removeObject(this); \
+    this->setIdentifier(ClassIdentifier<ClassName>::registerClass(this->getParents(), #ClassName, false, false)); \
+    if (Identifier::isCreatingHierarchy() && this->getParents()) \
+        this->getParents()->add(this->getIdentifier()); \
+    this->getIdentifier()->addObject(this)
+
+#define registerAbstractObject(ClassName) \
+    std::cout << "*** Register Object: " << #ClassName << "\n"; \
+    this->getIdentifier()->removeObject(this); \
+    this->setIdentifier(ClassIdentifier<ClassName>::registerClass(this->getParents(), #ClassName, false, true)); \
+    if (Identifier::isCreatingHierarchy() && this->getParents()) \
+        this->getParents()->add(this->getIdentifier()); \
+    this->getIdentifier()->addObject(this)
+
+#define unregisterObject() \
+    this->getIdentifier()->removeObject(this)
+
+#define Class(ClassName) \
+    ClassIdentifier<ClassName>::getIdentifier()
+
+#define CreateFactory(ClassName) \
+    Identifier* global_##ClassName##_Identifier = ClassIdentifier<ClassName>::getIdentifier()
+
+#define Factory(Name) \
+    ClassFactory::fabricate(Name)