Changeset 5155 in orxonox.OLD

Timestamp:

Aug 27, 2005, 3:39:26 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now one should be able to create entities on the Fly

Location:

trunk/src

Files:

• defs/functor_list.h (modified) (1 diff)
• glmenu/glmenu_imagescreen.cc (modified) (1 diff)
• lib/particles/particle_system.cc (modified) (1 diff)
• lib/physics/physics_connection.cc (modified) (1 diff)
• util/loading/factory.cc (modified) (3 diffs)
• util/loading/factory.h (modified) (2 diffs)
• util/shell_command.cc (modified) (2 diffs)
• util/shell_command.h (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/skybox.cc (modified) (1 diff)

trunk/src/defs/functor_list.h

@@ -97 +97 @@
 #define l_XML_ELEM_FUNC                         //!< The function to parse an XML_ELEM
 #define l_XML_ELEM_NAME    "XML"                //!< The name of an XML_ELEM
-//#define l_XML_ELEM_PARAM   Parameter        //!< the type of the parameter XML_ELEM
+//#define l_XML_ELEM_PARAM   Parameter            //!< the type of the parameter XML_ELEM
 #define l_XML_ELEM_DEFAULT NULL                 //!< The dafault Value for an XML_ELEM
 

trunk/src/glmenu/glmenu_imagescreen.cc

@@ -22 +22 @@
 #include "material.h"
 #include "factory.h"
+#include "load_param.h"
 
 CREATE_FACTORY(GLMenuImageScreen);

trunk/src/lib/particles/particle_system.cc

@@ -23 +23 @@
 #include "field.h"
 
+#include "load_param.h"
 #include "compiler.h"
 #include "material.h"

trunk/src/lib/physics/physics_connection.cc

@@ -25 +25 @@
 
 #include "factory.h"
+#include "load_param.h"
 
 using namespace std;

trunk/src/util/loading/factory.cc

@@ -16 +16 @@
 
 #include "factory.h"
+
+#include "shell_command.h"
 #include "game_loader.h"
-
 using namespace std;
 
@@ -68 +69 @@
 
   if( Factory::first == NULL)
+  {
     Factory::first = factory;
+    ShellCommand<Factory>::registerCommand("create", CL_FACTORY, &Factory::fabricate);
+  }
   else
   {
@@ -79 +83 @@
   }
 }
+
+void Factory::fabricate(const char* className, const char* entityName)
+{
+  if (className == NULL)
+    return;
+  Factory* fac = Factory::first;
+
+  while (fac != NULL)
+  {
+    if (!strcmp(className, fac->getName()))
+    {
+      PRINTF(3)("Create a new Object of type %s\n", fac->getName());
+      BaseObject* object = fac->fabricate(NULL);
+      if (object != NULL)
+      {
+        object->setName(entityName);
+      }
+      break;
+    }
+    fac = fac->next;
+  }
+}

trunk/src/util/loading/factory.h

@@ -26 +26 @@
 
 #include "tinyxml.h"
-#include "load_param.h"
 #include "base_object.h"
 #include "debug.h"
@@ -44 +43 @@
   ~Factory ();
 
-
+  void fabricate(const char* className, const char* entityName);
   virtual BaseObject* fabricate(const TiXmlElement* root) = NULL;
 

trunk/src/util/shell_command.cc

@@ -139 +139 @@
   while(elem != NULL)
   {
-    printf("%s\n", elem->getName());
+    printf("%s::%s\n", elem->className, elem->getName());
     if (!strncasecmp (executionString, elem->className, strlen(elem->className)) &&
          (*(executionString+strlen(elem->className)) == ' ' ||
@@ -170 +170 @@
         while(*commandBegin == ' ')
           commandBegin++;
-        tList<BaseObject>* list =  ClassList::getList(elem->classID);
+        tList<BaseObject>* list = ClassList::getList(elem->classID);
         if (list == NULL)
           break;

trunk/src/util/shell_command.h

@@ -10 +10 @@
 
 #include "helper_functions.h"
-#include "functor_list.h"
 #include "substring.h"
+#include "functor_list.h"
 
 #include <stdarg.h>

trunk/src/world_entities/player.cc

@@ -83 +83 @@
 {
   this->init();
-  this->loadParams(root);
+  if (root != NULL)
+    this->loadParams(root);
 
   //weapons:

trunk/src/world_entities/skybox.cc

@@ -23 +23 @@
 #include "factory.h"
 
+#include "load_param.h"
 #include "material.h"
 #include "vector.h"