Changeset 5156 in orxonox.OLD

Timestamp:

Aug 27, 2005, 3:57:42 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: no more segfaults wenn creating entities

Location:

trunk/src

Files:

• lib/graphics/light.cc (modified) (1 diff)
• util/loading/factory.cc (modified) (1 diff)
• util/loading/factory.h (modified) (4 diffs)

trunk/src/lib/graphics/light.cc

@@ -67 +67 @@
   this->setSpecularColor(1.0, 1.0, 1.0);
 
-  this->loadParams(root);
+  if (root != NULL)
+    this->loadParams(root);
 }
 

trunk/src/util/loading/factory.cc

@@ -95 +95 @@
     {
       PRINTF(3)("Create a new Object of type %s\n", fac->getName());
-      BaseObject* object = fac->fabricate(NULL);
+      BaseObject* object = fac->fabricateDirect();
       if (object != NULL)
       {

trunk/src/util/loading/factory.h

@@ -41 +41 @@
  public:
   Factory (const char* factoryName = NULL);
-  ~Factory ();
+  virtual ~Factory ();
 
   void fabricate(const char* className, const char* entityName);
   virtual BaseObject* fabricate(const TiXmlElement* root) = NULL;
+  virtual BaseObject* fabricateDirect() = NULL;
 
   static void registerFactory( Factory* factory);
@@ -73 +74 @@
   private:
   virtual BaseObject* fabricate(const TiXmlElement* root);
+  virtual BaseObject* fabricateDirect();
 };
 
@@ -93 +95 @@
 BaseObject* tFactory<T>::fabricate(const TiXmlElement* root)
 {
+  if (root == NULL)
+    return NULL;
+
   if(!strcmp(root->Value(), this->getName()))
     return new T ( root);
@@ -101 +106 @@
 }
 
+template<class T>
+    BaseObject* tFactory<T>::fabricateDirect()
+{
+  return new T((const TiXmlElement*)NULL);
+}
+
 #endif /* _FACTORY_H */