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

Timestamp:

Jun 30, 2005, 4:05:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: factory is now registered in Factory, not in Gameloader

Location:

orxonox/trunk/src/util/loading

Files:

• factory.cc (modified) (2 diffs)
• factory.h (modified) (1 diff)
• game_loader.cc (modified) (4 diffs)
• game_loader.h (modified) (1 diff)

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

@@ -35 +35 @@
   this->setName(factoryName);
 
-  if (Factory::first == NULL)
-    Factory::first = this;
-  next = NULL;
+  this->next = NULL;
 
-  initialize();
+  Factory::registerFactory(this);
 }
 
+/** a reference to the First Factory */
 Factory* Factory::first = NULL;
 
@@ -59 +58 @@
 
 /**
-   \brief make this particular factory known to the LevelFactory
-*/
-void Factory::initialize()
-{
-  GameLoader::getInstance()->registerFactory( this);
-}
-
-/**
-   \brief add a Factory to the Q
+   \brief add a Factory to the Factory Queue
+   \param factory a Factory to be registered
 */
 void Factory::registerFactory( Factory* factory)
 {
-  if( next == NULL) setNext( factory);
-  else next->registerFactory( factory);
+  assert( factory != NULL);
+
+  PRINTF(4)("Registered factory for '%s'\n", factory->getName());
+
+  if( Factory::first == NULL)
+    Factory::first = factory;
+  else
+  {
+    Factory* tmpFac = Factory::first;
+    while( tmpFac->next != NULL)
+    {
+      tmpFac = tmpFac->next;
+    }
+    tmpFac->setNext(factory);
+  }
 }
-

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

@@ -46 +46 @@
 
   virtual BaseObject* fabricate(const TiXmlElement* root) = NULL;
-  void initialize();
-  void registerFactory( Factory* factory);
+
+  static 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; };
+  static Factory* getFirst() { return Factory::first; };
   /** \returns the next factory */
   Factory* getNext(void) const { return this->next; };
 
 
- private:
-  Factory*          next;                 //!< pointer to the next factory.
-  static Factory*   first;                //!< A pointer to the first factory.
+  private:
+
+  private:
+    Factory*          next;                 //!< pointer to the next factory.
+    static Factory*   first;                //!< A pointer to the first factory.
 };
 

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

@@ -43 +43 @@
   this->setClassID(CL_GAME_LOADER, "GameLoader");
   this->setName("GameLoader");
-  first = NULL;
 }
 
@@ -317 +316 @@
 }
 
-
-/**
-   \brief add a Factory to the Factory Q
-   \param factory a Factory to be registered
-*/
-void GameLoader::registerFactory( Factory* factory)
-{
-        assert( factory != NULL);
-
-        PRINTF(4)("Registered factory for '%s'\n", factory->getName());
-
-        if( first == NULL) first = factory;
-        else first->registerFactory( factory);
-}
-
-
 /**
    \brief load a StoryEntity
@@ -341 +324 @@
   assert( element != NULL);
 
-  if( first == NULL)
+  if( Factory::getFirst() == NULL)
     {
       PRINTF(1)("GameLoader does not know any factories, fabricate() failed\n");
@@ -350 +333 @@
     {
       PRINTF(4)("Attempting fabrication of a '%s'\n", element->Value());
-      BaseObject* b = first->fabricate( element);
+      BaseObject* b = Factory::getFirst()->fabricate( element);
       if( b == NULL)
         PRINTF(2)("Failed to fabricate a '%s'\n", element->Value());

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

@@ -80 +80 @@
 
   EventHandler*          eventHandler;         //!< reference to the eventHandler
-
-  Factory*               first;                //!< the first factory of them all
 };