Changeset 3901 in orxonox.OLD for orxonox

Timestamp:

Apr 20, 2005, 12:16:32 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/levelLoader.tmp: temporaty

Location:

orxonox/branches/levelLoader.tmp/src

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (8 diffs)
• defs/factory.h (deleted)
• util/levelLoader (added)
• util/levelLoader/factory.cc (copied) (copied from orxonox/branches/levelloader/src/factory.cc)
• util/levelLoader/factory.h (copied) (copied from orxonox/branches/levelloader/src/factory.h) (1 diff)

orxonox/branches/levelLoader.tmp/src/Makefile.am

@@ -20 +20 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/levelloader
+
 
 
@@ -77 +79 @@
                  lib/xmlparser/tinyxmlparser.cc \
                  util/common/list.cc \
+                 util/levelloader/factory.cc \
                  util/resource_manager.cc \
                  lib/math/vector.cc \
                  lib/math/curve.cc \
-                 glmenu/glmenu_imagescreen.cc 
+                 glmenu/glmenu_imagescreen.cc  
 
 noinst_HEADERS = orxonox.h \
@@ -136 +139 @@
                  util/common/list.h \
                  util/common/list_template.h \
+                 utils/levelloader/factory.h \
                  util/resource_manager.h \
                  lib/util/ini_parser.h \

orxonox/branches/levelLoader.tmp/src/Makefile.in

@@ -71 +71 @@
         ini_parser.$(OBJEXT) tinystr.$(OBJEXT) tinyxml.$(OBJEXT) \
         tinyxmlerror.$(OBJEXT) tinyxmlparser.$(OBJEXT) list.$(OBJEXT) \
-        resource_manager.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \
-        glmenu_imagescreen.$(OBJEXT)
+        factory.$(OBJEXT) resource_manager.$(OBJEXT) vector.$(OBJEXT) \
+        curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
@@ -87 +87 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po ./$(DEPDIR)/curve.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/data_tank.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/environment.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/environment.Po ./$(DEPDIR)/factory.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/game_loader.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/garbage_collector.Po \
@@ -242 +242 @@
 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/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
+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/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/levelloader
 AM_LDFLAGS = $(MWINDOWS)
 orxonox_SOURCES = orxonox.cc \
@@ -292 +292 @@
                  lib/xmlparser/tinyxmlparser.cc \
                  util/common/list.cc \
+                 util/levelloader/factory.cc \
                  util/resource_manager.cc \
                  lib/math/vector.cc \
                  lib/math/curve.cc \
-                 glmenu/glmenu_imagescreen.cc 
+                 glmenu/glmenu_imagescreen.cc  
 
 noinst_HEADERS = orxonox.h \
@@ -351 +352 @@
                  util/common/list.h \
                  util/common/list_template.h \
+                 utils/levelloader/factory.h \
                  util/resource_manager.h \
                  lib/util/ini_parser.h \
@@ -450 +452 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_tank.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/factory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_loader.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/garbage_collector.Po@am__quote@
@@ -1160 +1163 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o list.obj `if test -f 'util/common/list.cc'; then $(CYGPATH_W) 'util/common/list.cc'; else $(CYGPATH_W) '$(srcdir)/util/common/list.cc'; fi`
+
+factory.o: util/levelloader/factory.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT factory.o -MD -MP -MF "$(DEPDIR)/factory.Tpo" -c -o factory.o `test -f 'util/levelloader/factory.cc' || echo '$(srcdir)/'`util/levelloader/factory.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/factory.Tpo" "$(DEPDIR)/factory.Po"; else rm -f "$(DEPDIR)/factory.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/levelloader/factory.cc' object='factory.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/factory.Po' tmpdepfile='$(DEPDIR)/factory.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o factory.o `test -f 'util/levelloader/factory.cc' || echo '$(srcdir)/'`util/levelloader/factory.cc
+
+factory.obj: util/levelloader/factory.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT factory.obj -MD -MP -MF "$(DEPDIR)/factory.Tpo" -c -o factory.obj `if test -f 'util/levelloader/factory.cc'; then $(CYGPATH_W) 'util/levelloader/factory.cc'; else $(CYGPATH_W) '$(srcdir)/util/levelloader/factory.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/factory.Tpo" "$(DEPDIR)/factory.Po"; else rm -f "$(DEPDIR)/factory.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/levelloader/factory.cc' object='factory.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/factory.Po' tmpdepfile='$(DEPDIR)/factory.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o factory.obj `if test -f 'util/levelloader/factory.cc'; then $(CYGPATH_W) 'util/levelloader/factory.cc'; else $(CYGPATH_W) '$(srcdir)/util/levelloader/factory.cc'; fi`
 
 resource_manager.o: util/resource_manager.cc
@@ -1347 +1366 @@
 
 distdir: $(DISTFILES)
-        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/lib/xmlparser $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(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/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/lib/xmlparser $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/utils/levelloader $(distdir)/world_entities
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

orxonox/branches/levelLoader.tmp/src/util/levelLoader/factory.h

@@ -6 +6 @@
 #ifndef _FACTORY_H
 #define _FACTORY_H
+
+
+/** creates a Subclass of Factory, that HOPEFULLY loads modules \todo check it for real */
+#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;
 
 #include "stdincl.h"