Changeset 4004 in orxonox.OLD for orxonox/branches/ll2trunktemp/src/factory.h

Timestamp:

Apr 28, 2005, 7:41:27 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/ll2trunktemp: changed the Factory-Macro into a Template, this code will be easyer to read and to debug
also found the segfault when deleting orxonox.
each factory tried to delete itself, because they were initialized implicitely (not with new).
now we only have to delete the first factory at the beginning

File:

• orxonox/branches/ll2trunktemp/src/factory.h (modified) (4 diffs)

orxonox/branches/ll2trunktemp/src/factory.h

@@ -11 +11 @@
 #include "xmlparser/tinyxml.h"
 
-#define CREATE_FACTORY(x) \
-                class x ## Factory : public Factory { \
-                 public:        \
-                  x ## Factory (){setClassname( #x );} \
-                  ~x ## Factory () {}; \
-                 private: \
-                        BaseObject* fabricate( TiXmlElement* root) \
-                        { \
-                                if(!strcmp(root->Value(), getClassname())) return new  x ( root); \
-                                else if( getNext() != NULL) return getNext()->fabricate( root); \
-                                else return NULL; \
-                        } \
-                }; \
-                x ## Factory global_ ## x ## Factory;
+/** 
+    Creates a factory to a Loadable Class.
+    this should be used at the beginning of all the Classes that should be loadable (in the cc-file)
+*/
+#define CREATE_FACTORY(x) tFactory<x>* global_ ## x ## Factory = new tFactory<x>(#x);
+
+
                 
 //! The Factory is
@@ -33 +26 @@
 
  public:
-  Factory ();
+  Factory (const char* name = NULL);
   ~Factory ();
   
@@ -40 +33 @@
   void initialize();
   void registerFactory( Factory* factory);
-  void setClassname(char* name) {classname = name;}
-  char* getClassname() {return classname;};
+  void setClassname(const char* name);
+  const char* getClassname() {return classname;};
   void setNext( Factory* factory) {next = factory;}
   Factory* getNext() {return next;}
@@ -51 +44 @@
 };
 
+template<class T> class tFactory : public Factory
+{
+ public:
+  tFactory(const char* name);
+  virtual ~tFactory();
+  
+  private:
+  BaseObject* fabricate( TiXmlElement* root);
+};
+
+template<class T>
+tFactory<T>::tFactory(const char* name) : Factory(name)
+{
+  printf("fileName: %s\n", name);
+}
+  
+
+template<class T>
+tFactory<T>::~tFactory()
+{}
+
+template<class T>
+BaseObject* tFactory<T>::fabricate( TiXmlElement* root) 
+{ 
+  if(!strcmp(root->Value(), getClassname()))
+    return new T ( root);
+  else if( getNext() != NULL) 
+    return getNext()->fabricate( root);
+  else 
+    return NULL;
+}
+
 // helper function
 
 const char* grabParameter( TiXmlElement* root, const char* name);
 
+
+
+
 #endif /* _FACTORY_H */