Changeset 9709 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/factory.h

Timestamp:

Aug 31, 2006, 10:51:08 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/new_class_id: new_class ID working, adapdet many classes, and reinvented some of the ClassID stuff

File:

• branches/new_class_id/src/lib/util/loading/factory.h (modified) (5 diffs)

branches/new_class_id/src/lib/util/loading/factory.h

@@ -20 +20 @@
 
 
-#ifndef _FACTORY_H
-#define _FACTORY_H
+#ifndef __FACTORY_H
+#define __FACTORY_H
 
 class BaseObject;
@@ -27 +27 @@
 #include "parser/tinyxml/tinyxml.h"
 #include "base_object.h"
-#include <vector>
 #include <list>
 
@@ -34 +33 @@
  * this should be used at the beginning of all the Classes that should be loadable (in the cc-file)
  */
-#define CREATE_FACTORY(CLASS_NAME, CLASS_ID) \
-    tFactory<CLASS_NAME>* global_##CLASS_NAME##_Factory = new tFactory<CLASS_NAME>(#CLASS_NAME, CLASS_ID)
+#define CREATE_FACTORY(CLASS_NAME) \
+    tFactory<CLASS_NAME>* global_##CLASS_NAME##_Factory = new tFactory<CLASS_NAME>(CLASS_NAME::classID())
 
 //! The Factory is a loadable object handler
@@ -48 +47 @@
   static  BaseObject* fabricate(const std::string& className);
   static  BaseObject* fabricate(const NewClassID& classID);
-  static  BaseObject* fabricate(int classID);
-  static  BaseObject* fabricate(const TiXmlElement* root = NULL);
+  static  BaseObject* fabricate(const TiXmlElement* root);
 
 
   bool operator==(int classID) const;
-  bool operator==(const char* className) const;
   bool operator==(const std::string& className) const;
+  bool operator==(const NewClassID& classID) const { return _classID == classID; };
 
 protected:
-  Factory (const std::string& factoryName, int classID);
+  Factory (const NewClassID& id);
   virtual BaseObject* fabricateObject(const TiXmlElement* root = NULL) const = 0;
 
+private:
+  Factory (const Factory&) {};
+
 protected:
-  const int                     _classID;              //!< The Class-Identifyer of the Factory.
-  const std::string             _className;            //!< The name of the Class.
+  const NewClassID              _classID;              //!< The Class-Identifyer of the Factory.
   static std::list<Factory*>*   _factoryList;          //!< List of Registered Factories
 };
@@ -78 +78 @@
    * @param classID the ID of the Class to be created.
    */
-  tFactory (const char* factoryName, int classID)
-      : Factory(factoryName, classID)
+  tFactory (const NewClassID& classID)
+      : Factory(classID)
   {  }
 
 private:
+  tFactory (const tFactory&) {};
   /**
    * @brief fabricates an Object of type T, with the constructor T::T(const TiXmlElemnt*)