Changeset 4730 in orxonox.OLD for orxonox/trunk/src/util

Timestamp:

Jun 29, 2005, 1:46:15 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: loading fields

Location:

orxonox/trunk/src/util/loading

Files:

• factory.cc (modified) (2 diffs)
• factory.h (modified) (5 diffs)

orxonox/trunk/src/util/loading/factory.cc

@@ -35 +35 @@
   this->setName(factoryName);
 
+  if (Factory::first == NULL)
+    Factory::first = this;
   next = NULL;
 
   initialize();
 }
+
+Factory* Factory::first = NULL;
 
 /**
@@ -55 +59 @@
 
 /**
-   \brief generates the associated object from data
-*/
-BaseObject* Factory::fabricate(const TiXmlElement* data)
-{
-  return NULL;
-}
-
-/**
    \brief make this particular factory known to the LevelFactory
 */
 void Factory::initialize()
 {
-#ifdef IS_ORXONOX
   GameLoader::getInstance()->registerFactory( this);
-#endif /* IS_ORXONOX */
 }
 

orxonox/trunk/src/util/loading/factory.h

@@ -35 +35 @@
   \todo make factoryName a BaseObject-parameter. (else it would be redundant)
 */
-#define CREATE_FACTORY(CLASS_NAME) tFactory<CLASS_NAME>* global_##CLASS_NAME##Factory = new tFactory<CLASS_NAME>(#CLASS_NAME)
+#define CREATE_FACTORY(CLASS_NAME) tFactory<CLASS_NAME>* global_##CLASS_NAME##_Factory = new tFactory<CLASS_NAME>(#CLASS_NAME)
 
 //! The Factory is a loadable object handler
@@ -45 +45 @@
 
 
-  virtual BaseObject* fabricate(const TiXmlElement* root);
+  virtual BaseObject* fabricate(const TiXmlElement* root) = NULL;
   void initialize();
   void registerFactory( Factory* factory);
   /** \brief sets the Next factory in the list \param nextFactory the next factory */
   inline void setNext( Factory* nextFactory) { this->next = nextFactory; };
+  /** \returns the first factory */
+  static Factory* getFirst(void) { return Factory::first; };
   /** \returns the next factory */
   Factory* getNext(void) const { return this->next; };
+
 
  private:
@@ -69 +72 @@
 
   private:
-  BaseObject* fabricate(const TiXmlElement* root);
+  virtual BaseObject* fabricate(const TiXmlElement* root);
 };
 
@@ -79 +82 @@
 tFactory<T>::tFactory(const char* factoryName) : Factory(factoryName)
 {
-  PRINTF(5)("fileName: %s loadable\n", this->getName());
+  PRINTF(5)("Class: %s loadable\n", this->getName());
 }
 
@@ -90 +93 @@
 BaseObject* tFactory<T>::fabricate(const TiXmlElement* root)
 {
-  if(!strcmp(root->Value(), getName()))
+  if(!strcmp(root->Value(), this->getName()))
     return new T ( root);
   else if( getNext() != NULL)