Changeset 4233 in orxonox.OLD

Timestamp:

May 20, 2005, 1:37:47 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/levelLoader: loading through Functors.
This should make our lives much more simple, if they are implemented real good.
This will take some time, and i would like you to comment on this.

Location:

orxonox/branches/levelLoader/src

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (4 diffs)
• util/loading (added)
• util/loading/load_param.cc (added)
• util/loading/load_param.h (added)
• world_entities/world_entity.cc (modified) (4 diffs)
• world_entities/world_entity.h (modified) (1 diff)

orxonox/branches/levelLoader/src/Makefile.am

@@ -22 +22 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/loading
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects
 
@@ -151 +152 @@
                  util/common/list_template.h \
                  util/resource_manager.h \
+                 util/loading/load_param.h \
                  lib/util/ini_parser.h \
                  lib/util/substring.h \
@@ -189 +191 @@
 
 ## orxonox.conf will be used from home-dir instead.
-EXTRA_DIST = orxonox.conf \
-             proto/proto_class.h \
+EXTRA_DIST = proto/proto_class.h \
              proto/proto_class.cc \
              proto/proto_singleton.h \

orxonox/branches/levelLoader/src/Makefile.in

@@ -280 +280 @@
 target_vendor = @target_vendor@
 MAINSRCDIR = .
-AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/subprojects
+AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/subprojects
 noinst_LIBRARIES = libORXgui.a \
                    libtinyxml.a
@@ -403 +403 @@
                  util/common/list_template.h \
                  util/resource_manager.h \
+                 util/loading/load_param.h \
                  lib/util/ini_parser.h \
                  lib/util/substring.h \
@@ -437 +438 @@
                        lib/xmlparser/tinyxmlparser.cc
 
-EXTRA_DIST = orxonox.conf \
-             proto/proto_class.h \
+EXTRA_DIST = proto/proto_class.h \
              proto/proto_class.cc \
              proto/proto_singleton.h \
@@ -1694 +1694 @@
 
 distdir: $(DISTFILES)
-        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/particles $(distdir)/lib/gui/gui $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/world_entities
+        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/particles $(distdir)/lib/gui/gui $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/util/loading $(distdir)/world_entities
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

orxonox/branches/levelLoader/src/world_entities/world_entity.cc

@@ -23 +23 @@
 #include "vector.h"
 
-//#include "stdincl.h"
-//#include "collision.h"
+#include "load_param.h"
 
 using namespace std;
@@ -51 +50 @@
     {
       PRINTF(2)("WorldEntity is missing a proper 'name'\n");
-      string = "Unknown";
-      temp = new char[strlen(string + 2)];
-      strcpy( temp, string);
-      this->setName( temp);
+      this->setName("unknown");
     }
   else
     {
-      temp = new char[strlen(string + 2)];
-      strcpy( temp, string);
-      this->setName( temp);
+      LoadParam<WorldEntity> (string, this, &WorldEntity::setName);
     }
   // Model Loading      
@@ -66 +60 @@
   string = grabParameter( root, "model");
   if( string != NULL)
-    this->model = (Model*)ResourceManager::getInstance()->load(string, OBJ, RP_CAMPAIGN);
+    LoadParam<WorldEntity>(string, this, &WorldEntity::loadModel);
   else
     {
@@ -87 +81 @@
   if (this->model)
     ResourceManager::getInstance()->unload(this->model);
+}
+
+/**
+   \brief loads a Model onto a WorldEntity
+   \param fileName the name of the model to load
+*/
+void WorldEntity::loadModel(const char* fileName)
+{
+  this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN);
 }
 

orxonox/branches/levelLoader/src/world_entities/world_entity.h

@@ -27 +27 @@
   virtual ~WorldEntity ();
 
+  void loadModel(const char* fileName);
 
   //void setCollision (CollisionCluster* newhull);