Changeset 4003 in orxonox.OLD

Timestamp:

Apr 28, 2005, 2:25:08 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/ll2trunktemp: some small modifications, testing, why 2 instances of fabricate are deleted, and not just the first one

Location:

orxonox/branches/ll2trunktemp/src

Files:

• defs/stdincl.h (modified) (1 diff)
• factory.cc (modified) (7 diffs)
• factory.h (modified) (2 diffs)
• game_loader.cc (modified) (1 diff)

orxonox/branches/ll2trunktemp/src/defs/stdincl.h

@@ -30 +30 @@
 #include "factory.h"
 
-#define CREATE_FACTORY(x) \
-                class x ## Factory : public Factory { \
-                 public:        \
-                  x ## Factory (){setNext( NULL); setClassname( #x ); initialize();} \
-                  ~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;
-                
 #endif /* _STDINCL_H */

orxonox/branches/ll2trunktemp/src/factory.cc

@@ -1 @@
-
-
 /* 
    orxonox - the future of 3D-vertical-scrollers
@@ -23 +21 @@
 
 /*  --------------------------------------------------
-*                Factory
-*   --------------------------------------------------
-*/
+ *               Factory
+ *   --------------------------------------------------
+ */
 
 /**
@@ -34 +32 @@
 Factory::Factory ()
 {
-        classname = "NULL";
-        next = NULL;
+  classname = "NULL";
+  next = NULL;
+  
+  initialize();
 }
 
@@ -45 +45 @@
 Factory::~Factory ()
 {
-  //if( next != NULL)   delete next;
+  printf("%s\n", this->classname);
+  Factory* tmpDel = this->next;
+  this->next = NULL;
+  //  if (tmpDel)
+  //    delete tmpDel;
 }
-
 
 /**
@@ -54 +57 @@
 BaseObject* Factory::fabricate( TiXmlElement* data)
 {
-        return NULL;
+  return NULL;
 }
 
@@ -62 +65 @@
 void Factory::initialize()
 {
-        assert( classname != NULL);
-        GameLoader* gl = GameLoader::getInstance();
-        gl->registerFactory( this);
+  assert( classname != NULL);
+  GameLoader* gl = GameLoader::getInstance();
+  gl->registerFactory( this);
 }
 
@@ -72 +75 @@
 void Factory::registerFactory( Factory* factory)
 {
-        if( next == NULL) setNext( factory);
-        else next->registerFactory( factory);
+  if( next == NULL) setNext( factory);
+  else next->registerFactory( factory);
 }
 
 const char* grabParameter( TiXmlElement* root, const char* name)
 {
-        TiXmlElement* element;
-        TiXmlNode* node;
+  TiXmlElement* element;
+  TiXmlNode* node;
         
-        assert( root != NULL);
-        assert( name != NULL);
+  assert( root != NULL);
+  assert( name != NULL);
         
-        element = root->FirstChildElement( name);
-        if( element == NULL) return NULL;
+  element = root->FirstChildElement( name);
+  if( element == NULL) return NULL;
         
-        node = element->FirstChild();
-        while( node != NULL)
-        {
-                if( node->ToText()) return node->Value();
-                node = node->NextSibling();
-        }
-        return NULL;
+  node = element->FirstChild();
+  while( node != NULL)
+    {
+      if( node->ToText()) return node->Value();
+      node = node->NextSibling();
+    }
+  return NULL;
 }
 

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;
+                
 //! The Factory is
 /**
-        Very philosophic description, huh?
+   Very philosophic description, huh?
 */
 class Factory {
@@ -20 +35 @@
   Factory ();
   ~Factory ();
+  
 
-        virtual BaseObject* fabricate( TiXmlElement* root);
-        void initialize();
-        void registerFactory( Factory* factory);
-        void setClassname(char* name) {classname = name;}
-        char* getClassname() {return classname;};
-        void setNext( Factory* factory) {next = factory;}
-        Factory* getNext() {return next;}
+  virtual BaseObject* fabricate( TiXmlElement* root);
+  void initialize();
+  void registerFactory( Factory* factory);
+  void setClassname(char* name) {classname = name;}
+  char* getClassname() {return classname;};
+  void setNext( Factory* factory) {next = factory;}
+  Factory* getNext() {return next;}
         
  private:
-        char* classname;
+  char* classname;
         
   Factory* next;

orxonox/branches/ll2trunktemp/src/game_loader.cc

@@ -166 +166 @@
   
   if( name == NULL)
-  {
-                PRINTF0("No filename specified for loading");
-                return NULL;
-  }
+    {
+      PRINTF0("No filename specified for loading");
+      return NULL;
+    }
   
-        TiXmlDocument* XMLDoc = new TiXmlDocument( name);
-        // load the campaign document
-        if( !XMLDoc->LoadFile())
-        {
-                // report an error
-                PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
-                delete XMLDoc;
-                return NULL;
-        }
-        
-        // check basic validity
-        TiXmlElement* root = XMLDoc->RootElement();
-        assert( root != NULL);
-        
-        if( strcmp( root->Value(), "Campaign"))
-        {
-                // report an error
-                PRINTF0("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
-                delete XMLDoc;
-                return NULL;
-        }
-        
-        // construct campaign
-        Campaign* c = new Campaign( root);
-        
-        // free the XML data
-        delete XMLDoc;
-        
-        return c;
+  TiXmlDocument* XMLDoc = new TiXmlDocument( name);
+  // load the campaign document
+  if( !XMLDoc->LoadFile())
+    {
+      // report an error
+      PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
+      delete XMLDoc;
+      return NULL;
+    }
+        
+  // check basic validity
+  TiXmlElement* root = XMLDoc->RootElement();
+  assert( root != NULL);
+        
+  if( strcmp( root->Value(), "Campaign"))
+    {
+      // report an error
+      PRINTF0("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
+      delete XMLDoc;
+      return NULL;
+    }
+        
+  // construct campaign
+  Campaign* c = new Campaign( root);
+        
+  // free the XML data
+  delete XMLDoc;
+        
+  return c;
 }