Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4261 in orxonox.OLD


Ignore:
Timestamp:
May 22, 2005, 3:19:57 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the levelLoader-branche back into the trunk, because it seems to be stable.
merged with command:
svn merge -r 4230:HEAD levelLoader ../trunk
no conflicts of any interesst

Location:
orxonox/trunk/src
Files:
3 deleted
30 edited
12 copied

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r4245 r4261  
    1414AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
    1515AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
     16AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/tinyxml
    1617AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
    1718AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
    … …  
    2223AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
    2324AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
     25AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/loading
    2426AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects
    2527
    … …  
    3032
    3133bin_PROGRAMS=orxonox
    32 noinst_LIBRARIES = libORXgui.a
    33 
    34 orxonox_DEPENDENCIES = libORXgui.a
    35 orxonox_LDADD = libORXgui.a $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
     34noinst_LIBRARIES = libORXgui.a \
     35                   libtinyxml.a
     36
     37orxonox_DEPENDENCIES = libORXgui.a \
     38                       libtinyxml.a
     39orxonox_LDADD = libORXgui.a \
     40                libtinyxml.a \
     41                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
     42
    3643orxonox_SOURCES= orxonox.cc \
    3744                 game_loader.cc \
    … …  
    4148                 track_manager.cc \
    4249                 track_node.cc \
    43                  factory.cc \
    4450                 util/animation/animation.cc \
    4551                 util/animation/animation3d.cc \
    … …  
    8793                 util/common/list.cc \
    8894                 util/resource_manager.cc \
     95                 util/loading/factory.cc \
     96                 util/loading/load_param.cc \
    8997                 lib/math/vector.cc \
    9098                 lib/math/curve.cc \
    9199                 glmenu/glmenu_imagescreen.cc \
    92                  lib/xmlparser/tinyxml.cc \
    93                  lib/xmlparser/tinystr.cc \
    94                  lib/xmlparser/tinyxmlerror.cc \
    95                  lib/xmlparser/tinyxmlparser.cc \
    96100                 subprojects/benchmark.cc
    97101
    … …  
    163167                 util/common/list_template.h \
    164168                 util/resource_manager.h \
     169                 util/loading/factory.h \
     170                 util/loading/load_param.h \
    165171                 lib/util/ini_parser.h \
    166172                 lib/util/substring.h \
    … …  
    193199                            lib/gui/gui/gui_update.cc
    194200
     201libtinyxml_a_SOURCES = lib/tinyxml/tinyxml.cc \
     202                       lib/tinyxml/tinystr.cc \
     203                       lib/tinyxml/tinyxmlerror.cc \
     204                       lib/tinyxml/tinyxmlparser.cc
     205
     206
    195207
    196208## orxonox.conf will be used from home-dir instead.
    197 EXTRA_DIST = orxonox.conf \
    198              proto/proto_class.h \
     209EXTRA_DIST = proto/proto_class.h \
    199210             proto/proto_class.cc \
    200211             proto/proto_singleton.h \

  • orxonox/trunk/src/Makefile.in

    r4245 r4261  
    1717
    1818
    19 SOURCES = $(libORXgui_a_SOURCES) $(orxonox_SOURCES)
     19SOURCES = $(libORXgui_a_SOURCES) $(libtinyxml_a_SOURCES) $(orxonox_SOURCES)
    2020
    2121srcdir = @srcdir@
    … …  
    6666        libORXgui_a-gui_update.$(OBJEXT)
    6767libORXgui_a_OBJECTS = $(am_libORXgui_a_OBJECTS)
     68libtinyxml_a_AR = $(AR) $(ARFLAGS)
     69libtinyxml_a_LIBADD =
     70am_libtinyxml_a_OBJECTS = tinyxml.$(OBJEXT) tinystr.$(OBJEXT) \
     71        tinyxmlerror.$(OBJEXT) tinyxmlparser.$(OBJEXT)
     72libtinyxml_a_OBJECTS = $(am_libtinyxml_a_OBJECTS)
    6873am__installdirs = "$(DESTDIR)$(bindir)"
    6974binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    … …  
    7176am_orxonox_OBJECTS = orxonox.$(OBJEXT) game_loader.$(OBJEXT) \
    7277        command_node.$(OBJEXT) keynames.$(OBJEXT) camera.$(OBJEXT) \
    73         track_manager.$(OBJEXT) track_node.$(OBJEXT) factory.$(OBJEXT) \
     78        track_manager.$(OBJEXT) track_node.$(OBJEXT) \
    7479        animation.$(OBJEXT) animation3d.$(OBJEXT) \
    7580        animation_player.$(OBJEXT) object_manager.$(OBJEXT) \
    … …  
    8994        base_entity.$(OBJEXT) base_object.$(OBJEXT) \
    9095        ini_parser.$(OBJEXT) substring.$(OBJEXT) list.$(OBJEXT) \
    91         resource_manager.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \
    92         glmenu_imagescreen.$(OBJEXT) tinyxml.$(OBJEXT) \
    93         tinystr.$(OBJEXT) tinyxmlerror.$(OBJEXT) \
    94         tinyxmlparser.$(OBJEXT) benchmark.$(OBJEXT)
     96        resource_manager.$(OBJEXT) factory.$(OBJEXT) \
     97        load_param.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \
     98        glmenu_imagescreen.$(OBJEXT) benchmark.$(OBJEXT)
    9599orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    96100am__DEPENDENCIES_1 =
    … …  
    126130@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_video.Po \
    127131@AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/list.Po \
    128 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/md2Model.Po \
    129 @AMDEP_TRUE@    ./$(DEPDIR)/model.Po ./$(DEPDIR)/null_parent.Po \
    130 @AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po \
     132@AMDEP_TRUE@    ./$(DEPDIR)/load_param.Po ./$(DEPDIR)/material.Po \
     133@AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Po ./$(DEPDIR)/model.Po \
     134@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
    131135@AMDEP_TRUE@    ./$(DEPDIR)/object_manager.Po \
    132136@AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
    … …  
    157161CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    158162        -o $@
    159 SOURCES = $(libORXgui_a_SOURCES) $(orxonox_SOURCES)
    160 DIST_SOURCES = $(libORXgui_a_SOURCES) $(orxonox_SOURCES)
     163SOURCES = $(libORXgui_a_SOURCES) $(libtinyxml_a_SOURCES) \
     164        $(orxonox_SOURCES)
     165DIST_SOURCES = $(libORXgui_a_SOURCES) $(libtinyxml_a_SOURCES) \
     166        $(orxonox_SOURCES)
    161167RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
    162168        html-recursive info-recursive install-data-recursive \
    … …  
    279285target_vendor = @target_vendor@
    280286MAINSRCDIR = .
    281 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
    282 noinst_LIBRARIES = libORXgui.a
    283 orxonox_DEPENDENCIES = libORXgui.a
    284 orxonox_LDADD = libORXgui.a $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
     287AM_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)/lib/tinyxml -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
     288noinst_LIBRARIES = libORXgui.a \
     289                   libtinyxml.a
     290
     291orxonox_DEPENDENCIES = libORXgui.a \
     292                       libtinyxml.a
     293
     294orxonox_LDADD = libORXgui.a \
     295                libtinyxml.a \
     296                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
     297
    285298orxonox_SOURCES = orxonox.cc \
    286299                 game_loader.cc \
    … …  
    290303                 track_manager.cc \
    291304                 track_node.cc \
    292                  factory.cc \
    293305                 util/animation/animation.cc \
    294306                 util/animation/animation3d.cc \
    … …  
    336348                 util/common/list.cc \
    337349                 util/resource_manager.cc \
     350                 util/loading/factory.cc \
     351                 util/loading/load_param.cc \
    338352                 lib/math/vector.cc \
    339353                 lib/math/curve.cc \
    340354                 glmenu/glmenu_imagescreen.cc \
    341                  lib/xmlparser/tinyxml.cc \
    342                  lib/xmlparser/tinystr.cc \
    343                  lib/xmlparser/tinyxmlerror.cc \
    344                  lib/xmlparser/tinyxmlparser.cc \
    345355                 subprojects/benchmark.cc
    346356
    … …  
    412422                 util/common/list_template.h \
    413423                 util/resource_manager.h \
     424                 util/loading/factory.h \
     425                 util/loading/load_param.h \
    414426                 lib/util/ini_parser.h \
    415427                 lib/util/substring.h \
    … …  
    441453                            lib/gui/gui/gui_update.cc
    442454
    443 EXTRA_DIST = orxonox.conf \
    444              proto/proto_class.h \
     455libtinyxml_a_SOURCES = lib/tinyxml/tinyxml.cc \
     456                       lib/tinyxml/tinystr.cc \
     457                       lib/tinyxml/tinyxmlerror.cc \
     458                       lib/tinyxml/tinyxmlparser.cc
     459
     460EXTRA_DIST = proto/proto_class.h \
    445461             proto/proto_class.cc \
    446462             proto/proto_singleton.h \
    … …  
    467483          esac; \
    468484        done; \
    469         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
     485        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
    470486        cd $(top_srcdir) && \
    471           $(AUTOMAKE) --foreign  src/Makefile
     487          $(AUTOMAKE) --gnu  src/Makefile
    472488.PRECIOUS: Makefile
    473489Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    494510        $(libORXgui_a_AR) libORXgui.a $(libORXgui_a_OBJECTS) $(libORXgui_a_LIBADD)
    495511        $(RANLIB) libORXgui.a
     512libtinyxml.a: $(libtinyxml_a_OBJECTS) $(libtinyxml_a_DEPENDENCIES)
     513        -rm -f libtinyxml.a
     514        $(libtinyxml_a_AR) libtinyxml.a $(libtinyxml_a_OBJECTS) $(libtinyxml_a_LIBADD)
     515        $(RANLIB) libtinyxml.a
    496516install-binPROGRAMS: $(bin_PROGRAMS)
    497517        @$(NORMAL_INSTALL)
    … …  
    562582@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Po@am__quote@
    563583@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
     584@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_param.Po@am__quote@
    564585@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
    565586@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Po@am__quote@
    … …  
    775796@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_update.obj `if test -f 'lib/gui/gui/gui_update.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_update.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_update.cc'; fi`
    776797
     798tinyxml.o: lib/tinyxml/tinyxml.cc
     799@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.o -MD -MP -MF "$(DEPDIR)/tinyxml.Tpo" -c -o tinyxml.o `test -f 'lib/tinyxml/tinyxml.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxml.cc; \
     800@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi
     801@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinyxml.cc' object='tinyxml.o' libtool=no @AMDEPBACKSLASH@
     802@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@
     803@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     804@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.o `test -f 'lib/tinyxml/tinyxml.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxml.cc
     805
     806tinyxml.obj: lib/tinyxml/tinyxml.cc
     807@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.obj -MD -MP -MF "$(DEPDIR)/tinyxml.Tpo" -c -o tinyxml.obj `if test -f 'lib/tinyxml/tinyxml.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxml.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxml.cc'; fi`; \
     808@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi
     809@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinyxml.cc' object='tinyxml.obj' libtool=no @AMDEPBACKSLASH@
     810@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@
     811@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     812@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.obj `if test -f 'lib/tinyxml/tinyxml.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxml.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxml.cc'; fi`
     813
     814tinystr.o: lib/tinyxml/tinystr.cc
     815@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.o -MD -MP -MF "$(DEPDIR)/tinystr.Tpo" -c -o tinystr.o `test -f 'lib/tinyxml/tinystr.cc' || echo '$(srcdir)/'`lib/tinyxml/tinystr.cc; \
     816@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi
     817@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinystr.cc' object='tinystr.o' libtool=no @AMDEPBACKSLASH@
     818@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@
     819@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     820@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.o `test -f 'lib/tinyxml/tinystr.cc' || echo '$(srcdir)/'`lib/tinyxml/tinystr.cc
     821
     822tinystr.obj: lib/tinyxml/tinystr.cc
     823@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.obj -MD -MP -MF "$(DEPDIR)/tinystr.Tpo" -c -o tinystr.obj `if test -f 'lib/tinyxml/tinystr.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinystr.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinystr.cc'; fi`; \
     824@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi
     825@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinystr.cc' object='tinystr.obj' libtool=no @AMDEPBACKSLASH@
     826@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@
     827@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     828@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.obj `if test -f 'lib/tinyxml/tinystr.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinystr.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinystr.cc'; fi`
     829
     830tinyxmlerror.o: lib/tinyxml/tinyxmlerror.cc
     831@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.o -MD -MP -MF "$(DEPDIR)/tinyxmlerror.Tpo" -c -o tinyxmlerror.o `test -f 'lib/tinyxml/tinyxmlerror.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxmlerror.cc; \
     832@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi
     833@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinyxmlerror.cc' object='tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@
     834@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@
     835@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     836@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.o `test -f 'lib/tinyxml/tinyxmlerror.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxmlerror.cc
     837
     838tinyxmlerror.obj: lib/tinyxml/tinyxmlerror.cc
     839@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.obj -MD -MP -MF "$(DEPDIR)/tinyxmlerror.Tpo" -c -o tinyxmlerror.obj `if test -f 'lib/tinyxml/tinyxmlerror.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxmlerror.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxmlerror.cc'; fi`; \
     840@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi
     841@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinyxmlerror.cc' object='tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@
     842@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@
     843@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     844@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.obj `if test -f 'lib/tinyxml/tinyxmlerror.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxmlerror.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxmlerror.cc'; fi`
     845
     846tinyxmlparser.o: lib/tinyxml/tinyxmlparser.cc
     847@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.o -MD -MP -MF "$(DEPDIR)/tinyxmlparser.Tpo" -c -o tinyxmlparser.o `test -f 'lib/tinyxml/tinyxmlparser.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxmlparser.cc; \
     848@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi
     849@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinyxmlparser.cc' object='tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@
     850@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@
     851@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     852@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.o `test -f 'lib/tinyxml/tinyxmlparser.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxmlparser.cc
     853
     854tinyxmlparser.obj: lib/tinyxml/tinyxmlparser.cc
     855@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.obj -MD -MP -MF "$(DEPDIR)/tinyxmlparser.Tpo" -c -o tinyxmlparser.obj `if test -f 'lib/tinyxml/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxmlparser.cc'; fi`; \
     856@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi
     857@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinyxmlparser.cc' object='tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@
     858@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@
     859@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     860@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.obj `if test -f 'lib/tinyxml/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxmlparser.cc'; fi`
     861
    777862camera.o: world_entities/camera.cc
    778863@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT camera.o -MD -MP -MF "$(DEPDIR)/camera.Tpo" -c -o camera.o `test -f 'world_entities/camera.cc' || echo '$(srcdir)/'`world_entities/camera.cc; \
    … …  
    14951580@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.obj `if test -f 'util/resource_manager.cc'; then $(CYGPATH_W) 'util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/util/resource_manager.cc'; fi`
    14961581
     1582factory.o: util/loading/factory.cc
     1583@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/loading/factory.cc' || echo '$(srcdir)/'`util/loading/factory.cc; \
     1584@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/factory.Tpo" "$(DEPDIR)/factory.Po"; else rm -f "$(DEPDIR)/factory.Tpo"; exit 1; fi
     1585@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/loading/factory.cc' object='factory.o' libtool=no @AMDEPBACKSLASH@
     1586@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/factory.Po' tmpdepfile='$(DEPDIR)/factory.TPo' @AMDEPBACKSLASH@
     1587@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1588@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o factory.o `test -f 'util/loading/factory.cc' || echo '$(srcdir)/'`util/loading/factory.cc
     1589
     1590factory.obj: util/loading/factory.cc
     1591@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/loading/factory.cc'; then $(CYGPATH_W) 'util/loading/factory.cc'; else $(CYGPATH_W) '$(srcdir)/util/loading/factory.cc'; fi`; \
     1592@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/factory.Tpo" "$(DEPDIR)/factory.Po"; else rm -f "$(DEPDIR)/factory.Tpo"; exit 1; fi
     1593@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/loading/factory.cc' object='factory.obj' libtool=no @AMDEPBACKSLASH@
     1594@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/factory.Po' tmpdepfile='$(DEPDIR)/factory.TPo' @AMDEPBACKSLASH@
     1595@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1596@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o factory.obj `if test -f 'util/loading/factory.cc'; then $(CYGPATH_W) 'util/loading/factory.cc'; else $(CYGPATH_W) '$(srcdir)/util/loading/factory.cc'; fi`
     1597
     1598load_param.o: util/loading/load_param.cc
     1599@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT load_param.o -MD -MP -MF "$(DEPDIR)/load_param.Tpo" -c -o load_param.o `test -f 'util/loading/load_param.cc' || echo '$(srcdir)/'`util/loading/load_param.cc; \
     1600@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/load_param.Tpo" "$(DEPDIR)/load_param.Po"; else rm -f "$(DEPDIR)/load_param.Tpo"; exit 1; fi
     1601@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/loading/load_param.cc' object='load_param.o' libtool=no @AMDEPBACKSLASH@
     1602@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/load_param.Po' tmpdepfile='$(DEPDIR)/load_param.TPo' @AMDEPBACKSLASH@
     1603@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1604@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o load_param.o `test -f 'util/loading/load_param.cc' || echo '$(srcdir)/'`util/loading/load_param.cc
     1605
     1606load_param.obj: util/loading/load_param.cc
     1607@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT load_param.obj -MD -MP -MF "$(DEPDIR)/load_param.Tpo" -c -o load_param.obj `if test -f 'util/loading/load_param.cc'; then $(CYGPATH_W) 'util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/util/loading/load_param.cc'; fi`; \
     1608@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/load_param.Tpo" "$(DEPDIR)/load_param.Po"; else rm -f "$(DEPDIR)/load_param.Tpo"; exit 1; fi
     1609@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/loading/load_param.cc' object='load_param.obj' libtool=no @AMDEPBACKSLASH@
     1610@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/load_param.Po' tmpdepfile='$(DEPDIR)/load_param.TPo' @AMDEPBACKSLASH@
     1611@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1612@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o load_param.obj `if test -f 'util/loading/load_param.cc'; then $(CYGPATH_W) 'util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/util/loading/load_param.cc'; fi`
     1613
    14971614vector.o: lib/math/vector.cc
    14981615@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.o -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.o `test -f 'lib/math/vector.cc' || echo '$(srcdir)/'`lib/math/vector.cc; \
    … …  
    15421659@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    15431660@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o glmenu_imagescreen.obj `if test -f 'glmenu/glmenu_imagescreen.cc'; then $(CYGPATH_W) 'glmenu/glmenu_imagescreen.cc'; else $(CYGPATH_W) '$(srcdir)/glmenu/glmenu_imagescreen.cc'; fi`
    1544 
    1545 tinyxml.o: lib/xmlparser/tinyxml.cc
    1546 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.o -MD -MP -MF "$(DEPDIR)/tinyxml.Tpo" -c -o tinyxml.o `test -f 'lib/xmlparser/tinyxml.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxml.cc; \
    1547 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi
    1548 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxml.cc' object='tinyxml.o' libtool=no @AMDEPBACKSLASH@
    1549 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@
    1550 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1551 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.o `test -f 'lib/xmlparser/tinyxml.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxml.cc
    1552 
    1553 tinyxml.obj: lib/xmlparser/tinyxml.cc
    1554 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.obj -MD -MP -MF "$(DEPDIR)/tinyxml.Tpo" -c -o tinyxml.obj `if test -f 'lib/xmlparser/tinyxml.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxml.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxml.cc'; fi`; \
    1555 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi
    1556 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxml.cc' object='tinyxml.obj' libtool=no @AMDEPBACKSLASH@
    1557 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@
    1558 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1559 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.obj `if test -f 'lib/xmlparser/tinyxml.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxml.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxml.cc'; fi`
    1560 
    1561 tinystr.o: lib/xmlparser/tinystr.cc
    1562 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.o -MD -MP -MF "$(DEPDIR)/tinystr.Tpo" -c -o tinystr.o `test -f 'lib/xmlparser/tinystr.cc' || echo '$(srcdir)/'`lib/xmlparser/tinystr.cc; \
    1563 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi
    1564 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinystr.cc' object='tinystr.o' libtool=no @AMDEPBACKSLASH@
    1565 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@
    1566 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1567 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.o `test -f 'lib/xmlparser/tinystr.cc' || echo '$(srcdir)/'`lib/xmlparser/tinystr.cc
    1568 
    1569 tinystr.obj: lib/xmlparser/tinystr.cc
    1570 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.obj -MD -MP -MF "$(DEPDIR)/tinystr.Tpo" -c -o tinystr.obj `if test -f 'lib/xmlparser/tinystr.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinystr.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinystr.cc'; fi`; \
    1571 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi
    1572 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinystr.cc' object='tinystr.obj' libtool=no @AMDEPBACKSLASH@
    1573 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@
    1574 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1575 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.obj `if test -f 'lib/xmlparser/tinystr.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinystr.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinystr.cc'; fi`
    1576 
    1577 tinyxmlerror.o: lib/xmlparser/tinyxmlerror.cc
    1578 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.o -MD -MP -MF "$(DEPDIR)/tinyxmlerror.Tpo" -c -o tinyxmlerror.o `test -f 'lib/xmlparser/tinyxmlerror.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlerror.cc; \
    1579 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi
    1580 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlerror.cc' object='tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@
    1581 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@
    1582 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1583 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.o `test -f 'lib/xmlparser/tinyxmlerror.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlerror.cc
    1584 
    1585 tinyxmlerror.obj: lib/xmlparser/tinyxmlerror.cc
    1586 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.obj -MD -MP -MF "$(DEPDIR)/tinyxmlerror.Tpo" -c -o tinyxmlerror.obj `if test -f 'lib/xmlparser/tinyxmlerror.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlerror.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlerror.cc'; fi`; \
    1587 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi
    1588 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlerror.cc' object='tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@
    1589 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@
    1590 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1591 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.obj `if test -f 'lib/xmlparser/tinyxmlerror.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlerror.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlerror.cc'; fi`
    1592 
    1593 tinyxmlparser.o: lib/xmlparser/tinyxmlparser.cc
    1594 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.o -MD -MP -MF "$(DEPDIR)/tinyxmlparser.Tpo" -c -o tinyxmlparser.o `test -f 'lib/xmlparser/tinyxmlparser.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlparser.cc; \
    1595 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi
    1596 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlparser.cc' object='tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@
    1597 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@
    1598 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1599 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.o `test -f 'lib/xmlparser/tinyxmlparser.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlparser.cc
    1600 
    1601 tinyxmlparser.obj: lib/xmlparser/tinyxmlparser.cc
    1602 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.obj -MD -MP -MF "$(DEPDIR)/tinyxmlparser.Tpo" -c -o tinyxmlparser.obj `if test -f 'lib/xmlparser/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlparser.cc'; fi`; \
    1603 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi
    1604 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlparser.cc' object='tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@
    1605 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@
    1606 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1607 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.obj `if test -f 'lib/xmlparser/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlparser.cc'; fi`
    16081661
    16091662benchmark.o: subprojects/benchmark.cc
    … …  
    17451798
    17461799distdir: $(DISTFILES)
    1747         $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(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
     1800        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(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
    17481801        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    17491802        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

  • orxonox/trunk/src/defs/stdincl.h

    r4091 r4261  
    2828
    2929#include "compiler.h"
    30 #include "xmlparser/tinyxml.h"
    31 #include "factory.h"
    3230
    3331#endif /* _STDINCL_H */

  • orxonox/trunk/src/game_loader.cc

    r4216 r4261  
    1515   co-programmer: ...
    1616*/
    17 
    1817
    1918#include "game_loader.h"
    … …  
    8584}
    8685
    87 
    8886/**
    8987   \brief loads a debug campaign for test purposes only.

  • orxonox/trunk/src/game_loader.h

    r4216 r4261  
    1919class Camera;
    2020class CammandNode;
     21class Factory;
     22class TiXmlElement;
     23class BaseObject;
    2124
    2225//! The GameLoader

  • orxonox/trunk/src/glmenu/glmenu_imagescreen.cc

    r4136 r4261  
    1919#include "glmenu_imagescreen.h"
    2020
    21 #include "stdincl.h"
    2221#include "graphics_engine.h"
    2322#include "material.h"
     23#include "factory.h"
    2424
    2525CREATE_FACTORY(GLMenuImageScreen);
    … …  
    3838   \param root The Element to load the GLMenu from
    3939*/
    40 GLMenuImageScreen::GLMenuImageScreen (TiXmlElement* root)
     40GLMenuImageScreen::GLMenuImageScreen(const TiXmlElement* root)
    4141{
    4242  this->init();
    43   this->load(root);
    44 
     43  this->loadParams(root);
    4544}
    4645
    … …  
    5655   \li ElementCount: INT: how many elements will be loaded
    5756*/
    58 void GLMenuImageScreen::load(TiXmlElement* root)
    59 {
    60   const char* string;
    61 
    62   // Model Loading     
    63   string = grabParameter( root, "BackgroundImage");
    64   if( string != NULL)
    65     this->setBackgroundImage(string);
    66 
    67   string = grabParameter(root, "BackgroundPS");
    68   if (string != NULL)
    69     {
    70       float f1, f2, f3, f4;
    71       sscanf (string, "%f %f %f %f", &f1, &f2, &f3, &f4);
    72       this->setPosition(f1,f2);
    73       this->setScale(f3,f4);
    74     }
    75 
    76   string = grabParameter( root, "BarImage");
    77   if (string != NULL)
    78     this->setBarImage(string);
    79   string = grabParameter(root, "BarPS");
    80   if (string != NULL)
    81     {
    82       float f1, f2, f3, f4;
    83       sscanf (string, "%f %f %f %f", &f1, &f2, &f3, &f4);
    84       this->setBarPosScale(f1,f2,f3,f4);
    85     }
    86 
    87   string = grabParameter( root, "ElementCount");
    88   if (string != NULL)
    89     this->setMaximum(atoi(string));
     57void GLMenuImageScreen::loadParams(const TiXmlElement* root)
     58{
     59  LoadParam<GLMenuImageScreen>(root, "BackgroundImage", this, &GLMenuImageScreen::setBackgroundImage)
     60    .describe("sets the image to load onto the loadscreen");
     61
     62  LoadParam<GLMenuImageScreen>(root, "BackgroundPS", this, &GLMenuImageScreen::setPosScale)
     63    .describe("The Position and Scale of the Background Image in %(0-1.0). PosX, PosY, SizeX, SizeY");
     64
     65  LoadParam<GLMenuImageScreen>(root, "BarImage", this, &GLMenuImageScreen::setBarImage)
     66    .describe("sets the image of the LoadingBar");
     67 
     68  LoadParam<GLMenuImageScreen>(root, "BarPS", this, &GLMenuImageScreen::setBarPosScale)
     69    .describe("The Position and Scale of the Loading Bar in %(0-1.0). PosX, PosY, SizeX, SizeY");
     70
     71  LoadParam<GLMenuImageScreen>(root, "ElementCount", this, &GLMenuImageScreen::setMaximum)
     72    .describe("The Count of elements to load into the bar (this is only a maximum value)");
    9073}
    9174
    … …  
    149132  this->scaleX = scaleX;
    150133  this->scaleY = scaleY;
     134}
     135
     136/*
     137  \brief sets position and size of the ImageScreen
     138  \param x offset from the top left corner in percent(0-1) of the screensize
     139  \param y offset from the top left corner in percent(0-1) of the screensize
     140  \param scaleX the scaleing of the image into the x-direction (in percent (0-1))
     141  \param scaleY the scaleing of the image into the y-direction (in percent (0-1))
     142*/
     143void GLMenuImageScreen::setPosScale(float offsetX, float offsetY, float scaleX, float scaleY)
     144{
     145  this->setPosition(offsetX, offsetY);
     146  this->setScale(scaleX, scaleY);
    151147}
    152148

  • orxonox/trunk/src/glmenu/glmenu_imagescreen.h

    r4104 r4261  
    1717 public:
    1818  GLMenuImageScreen ();
    19   GLMenuImageScreen (TiXmlElement* root);
    20   void load(TiXmlElement* root);
     19  GLMenuImageScreen (const TiXmlElement* root);
     20  void loadParams(const TiXmlElement* root);
    2121  virtual ~GLMenuImageScreen ();
    2222
    … …  
    2828  void setPosition(float offsetX, float offsetY);
    2929  void setScale (float scaleX, float scaleY);
     30  void setPosScale(float offsetX, float offsetY, float scaleX, float scaleY);
    3031
    3132  void setBarImage(const char* barImage);

  • orxonox/trunk/src/lib/Makefile.in

    r4130 r4261  
    183183          esac; \
    184184        done; \
    185         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
     185        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
    186186        cd $(top_srcdir) && \
    187           $(AUTOMAKE) --foreign  src/lib/Makefile
     187          $(AUTOMAKE) --gnu  src/lib/Makefile
    188188.PRECIOUS: Makefile
    189189Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/graphics/Makefile.in

    r4130 r4261  
    177177          esac; \
    178178        done; \
    179         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
     179        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
    180180        cd $(top_srcdir) && \
    181           $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
     181          $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
    182182.PRECIOUS: Makefile
    183183Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/graphics/importer/Makefile.in

    r4130 r4261  
    235235          esac; \
    236236        done; \
    237         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
     237        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
    238238        cd $(top_srcdir) && \
    239           $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
     239          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
    240240.PRECIOUS: Makefile
    241241Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/gui/Makefile.in

    r4130 r4261  
    179179          esac; \
    180180        done; \
    181         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
     181        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
    182182        cd $(top_srcdir) && \
    183           $(AUTOMAKE) --foreign  src/lib/gui/Makefile
     183          $(AUTOMAKE) --gnu  src/lib/gui/Makefile
    184184.PRECIOUS: Makefile
    185185Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/gui/console/Makefile.in

    r4130 r4261  
    205205          esac; \
    206206        done; \
    207         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
     207        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile'; \
    208208        cd $(top_srcdir) && \
    209           $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
     209          $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile
    210210.PRECIOUS: Makefile
    211211Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/gui/gui/Makefile.in

    r4130 r4261  
    265265          esac; \
    266266        done; \
    267         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile'; \
     267        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile'; \
    268268        cd $(top_srcdir) && \
    269           $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile
     269          $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile
    270270.PRECIOUS: Makefile
    271271Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/lang/base_object.cc

    r3651 r4261  
    3939BaseObject::~BaseObject ()
    4040{
    41   delete []this->className;
     41  //  delete []this->className;
    4242}
    4343
    44 void BaseObject::setClassName (char* className)
     44void BaseObject::setClassName (const char* className)
    4545{
    46   this->className = new char[strlen(className)+1];
    47   strcpy(this->className, className);
    48 }
    49 
    50 char* BaseObject::getClassName(void) const
    51 {
    52   return className;
     46  this->className = className;
    5347}
    5448

  • orxonox/trunk/src/lib/lang/base_object.h

    r3651 r4261  
    1717  virtual ~BaseObject ();
    1818
    19   void setClassName (char* className);
    20   char* getClassName(void) const;
     19  void setClassName (const char* className);
     20  inline const char* getClassName(void) const { return this->className;};
    2121  bool isA (char* className);
    2222
    … …  
    2525
    2626 private:
    27   char* className;
     27  const char* className;
    2828  bool finalized;
    2929};

  • orxonox/trunk/src/story_entities/campaign.cc

    r4114 r4261  
    2727#include "list.h"
    2828
     29#include "load_param.h"
     30
    2931using namespace std;
    3032
    … …  
    3537  this->isInit = false;
    3638}
     39
    3740Campaign::Campaign ( TiXmlElement* root)
    3841{

  • orxonox/trunk/src/story_entities/campaign.h

    r4010 r4261  
    88
    99class World;
     10class TiXmlElement;
    1011template<class T> class tList;
    1112

  • orxonox/trunk/src/story_entities/story_entity.h

    r3629 r4261  
    1111#include "story_def.h"
    1212#include "error.h"
    13 
    1413
    1514//! A class that represents something to play in orxonox. it is a container for worlds, movies, mission briefings, etc...

  • orxonox/trunk/src/story_entities/world.cc

    r4245 r4261  
    5353#include "substring.h"
    5454
    55 
     55#include "factory.h"
    5656
    5757using namespace std;
    … …  
    123123CREATE_FACTORY(World);
    124124
    125 World::World( TiXmlElement* root)
     125World::World(const TiXmlElement* root)
    126126{
    127127  this->constuctorInit("", -1);
    128128  this->path = NULL;
    129   const char *string;
    130   char *name;
    131   int id;
    132  
    133   PRINTF0("Creating a World\n");
    134  
    135   // identifier
    136   string = grabParameter( root, "identifier");
    137   if( string == NULL || sscanf(string, "%d", &id) != 1)
    138     {
    139       PRINTF0("World is missing a proper 'identifier'\n");
    140       this->setStoryID( -1);
    141     }
    142   else setStoryID( id);
    143 
    144   // next id
    145   string = grabParameter( root, "nextid");
    146   if( string == NULL || sscanf(string, "%d", &id) != 1)
    147     {
    148       PRINTF0("World is missing a proper 'nextid'\n");
    149       this->setStoryID( -1);
    150     }
    151   else setNextStoryID( id);
    152  
    153 
    154   // path
    155   string = grabParameter( root, "path");
    156   if( string == NULL)
    157     {
    158       PRINTF0("World is missing a proper 'path'\n");
    159       this->setPath( NULL);
    160     }
    161   else
    162     {
    163       name = new char[strlen(string + 2)];
    164       strcpy( name, string);
    165       this->setPath( name);
    166     }
     129 
     130  this->loadParams(root);
    167131}
    168132
    … …  
    213177  //delete animator
    214178
     179  LoadClassDescription::printAll();
     180
    215181  ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
    216182}
    … …  
    234200  this->debugWorldNr = worldID;
    235201  this->entities = new tList<WorldEntity>();
     202}
     203
     204void World::loadParams(const TiXmlElement* root)
     205{
     206  const char *string;
     207  char *name;
     208  int id;
     209
     210  PRINTF0("Creating a World\n");
     211
     212  LoadParam<World>(root, "identifier", this, &World::setStoryID)
     213    .describe("Sets the StoryID of this world");
     214  LoadParam<World>(root, "nextid", this, &World::setNextStoryID)
     215    .describe("Sets the ID of the next world");
     216  LoadParam<World>(root, "path", this, &World::setPath)
     217    .describe("The Filename of this World (relative from the data-dir)");
     218
     219
     220  /* 
     221  // identifier
     222  string = grabParameter( root, "identifier");
     223  if( string == NULL || sscanf(string, "%d", &id) != 1)
     224  {
     225  PRINTF0("World is missing a proper 'identifier'\n");
     226  this->setStoryID( -1);
     227  }
     228  else setStoryID( id);
     229
     230  // next id
     231  string = grabParameter( root, "nextid");
     232  if( string == NULL || sscanf(string, "%d", &id) != 1)
     233  {
     234  PRINTF0("World is missing a proper 'nextid'\n");
     235  this->setStoryID( -1);
     236  }
     237  else setNextStoryID( id);
     238 
     239
     240  // path
     241  string = grabParameter( root, "path");
     242  if( string == NULL)
     243  {
     244  PRINTF0("World is missing a proper 'path'\n");
     245  this->setPath( NULL);
     246  }
     247  else
     248  {
     249  name = new char[strlen(string + 2)];
     250  strcpy( name, string);
     251  this->setPath( name);
     252  }
     253  */
    236254}
    237255
    … …  
    334352  else
    335353    {
    336       this->glmis->load(element);
     354      this->glmis->loadParams(element);
    337355      this->glmis->draw();
    338356    }
    … …  
    421439  glNewList (objectList, GL_COMPILE);
    422440 
    423 
    424441  //trackManager->drawGraph(.01);
    425442  //trackManager->debug(2);

  • orxonox/trunk/src/story_entities/world.h

    r4176 r4261  
    1111#include "story_entity.h"
    1212#include "p_node.h"
    13 #include "xmlparser/tinyxml.h"
    1413
    1514class World;
    … …  
    2423class GarbageCollector;
    2524class Text;
     25class TiXmlElement;
    2626
    2727//! The game world Interface
    … …  
    5656  World (char* name);
    5757  World (int worldID);
    58   World (TiXmlElement* root);
     58  World (const TiXmlElement* root = NULL);
    5959  virtual ~World ();
     60
     61  void loadParams(const TiXmlElement* root);
    6062
    6163  double getGameTime();

  • orxonox/trunk/src/subprojects/Makefile.in

    r4130 r4261  
    177177          esac; \
    178178        done; \
    179         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/Makefile'; \
     179        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/Makefile'; \
    180180        cd $(top_srcdir) && \
    181           $(AUTOMAKE) --foreign  src/subprojects/Makefile
     181          $(AUTOMAKE) --gnu  src/subprojects/Makefile
    182182.PRECIOUS: Makefile
    183183Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/testmain/Makefile.in

    r4130 r4261  
    197197          esac; \
    198198        done; \
    199         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile'; \
     199        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile'; \
    200200        cd $(top_srcdir) && \
    201           $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile
     201          $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile
    202202.PRECIOUS: Makefile
    203203Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/track_manager.cc

    r4220 r4261  
    2626#include "t_animation.h"
    2727#include "substring.h"
     28#include "tinyxml.h"
    2829
    2930#include <stdarg.h>
    … …  
    421422              if( sscanf( container->Value(), "%lf,%lf,%lf", &x, &y, &z) == 3)
    422423                {
    423                   PRINTF(0)("Loaded Point: %lf,%lf,%lf (%s)\n", x, y, z, container->Value());
     424                  PRINTF(5)("Loaded Point: %lf,%lf,%lf (%s)\n", x, y, z, container->Value());
    424425                  addPoint( Vector( x, y, z));
    425426                }

  • orxonox/trunk/src/track_manager.h

    r4220 r4261  
    1818class PNode;
    1919class Text;
     20class TiXmlElement;
    2021template<class T> class tAnimation;
    2122template<class T> class tList;

  • orxonox/trunk/src/world_entities/player.cc

    r4114 r4261  
    8080   \todo add more parameters to load
    8181*/
    82 Player::Player(TiXmlElement* root) : WorldEntity(root)
     82Player::Player(const TiXmlElement* root) : WorldEntity(root)
    8383{
    8484  this->weapons = new tList<Weapon>();

  • orxonox/trunk/src/world_entities/player.h

    r4010 r4261  
    2222 public:
    2323  Player();
    24   Player(TiXmlElement* root);
     24  Player(const TiXmlElement* root);
    2525  virtual ~Player();
    2626

  • orxonox/trunk/src/world_entities/skybox.cc

    r4136 r4261  
    1111
    1212   ### File Specific:
    13    main-programmer: David Gruetter
    14    co-programmer: Benjamin Grauer
    15    
    16    Created by Dave: this file is actually quite similar to player.cc and so is
    17    skybox.h similar to player.h
    18    With that said, things should be clear:)
    19    
    20    Edited:
    21    Bensch: more constructors, changeability, comments...
    22    Patrick: giving it the common orxonox style, not much to do... good work Dave!
    23 
     13   main-programmer: Benjamin Grauer
     14   co-programmer: ...
    2415*/
    2516
    … …  
    4637   \param fileName the file to take as input for the SkyBox
    4738*/
    48 SkyBox::SkyBox(char* fileName)
     39SkyBox::SkyBox(const char* fileName)
    4940{
    5041  this->preInit();
     42  if (fileName)
     43    this->setTextureAndType(fileName, ".jpg");
    5144  this->postInit();
    5245}
    5346
    54 SkyBox::SkyBox(TiXmlElement* root) : WorldEntity(root)
     47SkyBox::SkyBox(const TiXmlElement* root) : WorldEntity(root)
    5548{
    5649  this->preInit();
    5750
    58   const char* string;
    59 
    60   // Model Loading     
    61   string = grabParameter( root, "materialset");
    62   if( string != NULL)
    63     this->setTexture(string, "jpg");
    64   else
    65     {
    66       PRINTF(0)("SkyBox is missing a proper 'MaterialSet'\n");
    67     }
    68   if( this->skyModel == NULL)
    69     {
    70       PRINTF(0)("SkyBox model '%s' could not be loaded\n", string);
    71     }
     51  this->loadParams(root);
     52
    7253  this->postInit();
     54}
     55
     56void SkyBox::loadParams(const TiXmlElement* root)
     57{
     58  LoadParam<SkyBox>(root, "Materialset", this, &SkyBox::setTexture)
     59    .describe("Sets the material on the SkyBox. The string must be the path relative to the data-dir, and without a trailing .jpg");
    7360}
    7461
    … …  
    116103               "skybox_right.jpg", "skybox_front.jpg", "skybox_back.jpg");
    117104*/
    118 void SkyBox::setTexture(const char* name, const char* extension)
     105void SkyBox::setTextureAndType(const char* name, const char* extension)
    119106{
    120107  char* top    = new char[strlen(name)+strlen(extension)+ 10];
    … …  
    219206
    220207  this->skyModel->setMaterial(material[0]);
    221   this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,1,3, 3,2,3, 5,3,3, 4,0,3); // top
     208  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,0,3, 3,1,3, 5,2,3, 4,3,3); // top
    222209  this->skyModel->setMaterial(material[1]);
    223   this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,3,1, 7,0,1, 1,1,1, 0,2,1); // bottom
     210  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,0,1, 7,1,1, 1,2,1, 0,3,1); // bottom
    224211  this->skyModel->setMaterial(material[2]);
    225   this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,2, 1,1,2, 3,2,2, 2,3,2); // left
     212  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,2,2, 5,3,2, 7,0,2, 6,1,2); // left
    226213  this->skyModel->setMaterial(material[3]);
    227   this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,2,0, 5,3,0, 7,0,0, 6,1,0); // right
     214  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,0, 1,1,0, 3,2,0, 2,3,0); // right
    228215  this->skyModel->setMaterial(material[4]);
    229   this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,0,5, 7,1,5, 5,2,5, 3,3,6); // front
     216  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,0,5, 7,1,5, 5,2,5, 3,3,5); // front
    230217  this->skyModel->setMaterial(material[5]);
    231218  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,0,4, 0,1,4, 2,2,4, 4,3,4); // back

  • orxonox/trunk/src/world_entities/skybox.h

    r4136 r4261  
    2121{
    2222 public:
    23   SkyBox(char* fileName = NULL);
    24   SkyBox(TiXmlElement* root);
     23  SkyBox(const char* fileName = NULL);
     24  SkyBox(const TiXmlElement* root);
    2525
    2626  virtual ~SkyBox();
     27
     28  void loadParams(const TiXmlElement* root);
    2729
    2830  void preInit(void);
    … …  
    3133
    3234  void setSize(float size);
    33   void setTexture(const char* name, const char* extension);
     35  /** \brief assumes jpg as input-format */
     36  void setTexture(const char* name) { setTextureAndType (name, "jpg");};
     37  void setTextureAndType(const char* name, const char* extension);
    3438  void setTextures(const char* top, const char* bottom, const char* left, const char* right, const char* front, const char* back);
    3539

  • orxonox/trunk/src/world_entities/world_entity.cc

    r4115 r4261  
    2323#include "vector.h"
    2424
    25 //#include "stdincl.h"
    26 //#include "collision.h"
    27 
    2825using namespace std;
    2926
    3027/**
    31    \brief standard constructor
    32 */
    33 WorldEntity::WorldEntity ()
     28   \brief Loads the WordEntity-specific Part of any derived Class
     29*/
     30WorldEntity::WorldEntity(const TiXmlElement* root)
    3431{
    3532  this->setClassName ("WorldEntity");
     33  this->model = NULL;
     34
     35  if (root)
     36    this->loadParams(root);
     37
    3638  this->bDraw = true;
    37   this->model = NULL;
    38   //  collisioncluster = NULL;
    39 }
    40 
    41 /**
    42    \brief Loads the WordEntity-specific Part of any derived Class
    43 */
    44 WorldEntity::WorldEntity(TiXmlElement* root)
    45 {
    46   // Name Setup
    47   char* temp;
    48   const char* string;
    49   string = grabParameter( root, "name");
    50   if( string == NULL)
    51     {
    52       PRINTF(2)("WorldEntity is missing a proper 'name'\n");
    53       string = "Unknown";
    54       temp = new char[strlen(string + 2)];
    55       strcpy( temp, string);
    56       this->setName( temp);
    57     }
    58   else
    59     {
    60       temp = new char[strlen(string + 2)];
    61       strcpy( temp, string);
    62       this->setName( temp);
    63     }
     39}
     40
     41void WorldEntity::loadParams(const TiXmlElement* root)
     42{
     43  // name setup
     44  LoadParam<WorldEntity>(root, "name", this, &WorldEntity::setName)
     45    .describe("the name of the Object at hand");
     46
    6447  // Model Loading     
    65   this->model = NULL;
    66   string = grabParameter( root, "model");
    67   if( string != NULL)
    68     this->model = (Model*)ResourceManager::getInstance()->load(string, OBJ, RP_CAMPAIGN);
    69   else
    70     {
    71       PRINTF(2)("WorldEntity is missing a proper 'model'\n");
    72       this->model = NULL;
    73     }
    74   if( this->model == NULL)
    75     {
    76       PRINTF(2)("WorldEntity model '%s' could not be loaded\n", string);
    77     }
    78   this->bDraw = true;
     48  LoadParam<WorldEntity>(root, "model", this, &WorldEntity::loadModel)
     49    .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)") ;
    7950}
    8051
    … …  
    8758  if (this->model)
    8859    ResourceManager::getInstance()->unload(this->model);
     60}
     61
     62/**
     63   \brief loads a Model onto a WorldEntity
     64   \param fileName the name of the model to load
     65*/
     66void WorldEntity::loadModel(const char* fileName)
     67{
     68  if (this->model)
     69    ResourceManager::getInstance()->unload(this->model, RP_LEVEL);
     70  this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN);
    8971}
    9072

  • orxonox/trunk/src/world_entities/world_entity.h

    r4010 r4261  
    1010#include "comincl.h"
    1111#include "resource_manager.h"
     12#include "factory.h"
     13#include "load_param.h"
    1214
    1315
    … …  
    1517class CharacterAttributes;
    1618class Model;
    17 
    18 
    1919//! Basic class from which all interactive stuff in the world is derived from
    2020class WorldEntity : public PNode
    … …  
    2323
    2424 public:
    25   WorldEntity (void);
    26   WorldEntity(TiXmlElement* root);
     25  WorldEntity(const TiXmlElement* root = NULL);
    2726  virtual ~WorldEntity ();
    2827
     28  void loadParams(const TiXmlElement* root);
     29  void loadModel(const char* fileName);
    2930
    3031  //void setCollision (CollisionCluster* newhull);
Note: See TracChangeset for help on using the changeset viewer.