Changeset 4245 in orxonox.OLD for orxonox/trunk

Timestamp:

May 20, 2005, 11:28:43 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: merged back the md2_loader branche manualy (a full merge was impossible).

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (6 diffs)
• Makefile.in (modified) (15 diffs)
• lib/graphics/graphics_engine.cc (modified) (3 diffs)
• lib/graphics/graphics_engine.h (modified) (3 diffs)
• lib/graphics/importer/abstract_model.h (added)
• lib/graphics/importer/anorms.h (added)
• lib/graphics/importer/anormtab.h (added)
• lib/graphics/importer/md2Model.cc (added)
• lib/graphics/importer/md2Model.h (added)
• story_entities/world.cc (modified) (12 diffs)
• util/object_manager.cc (added)
• util/object_manager.h (added)
• world_entities/test_entity.cc (added)
• world_entities/test_entity.h (added)

orxonox/trunk/src/Makefile.am

@@ -45 +45 @@
                  util/animation/animation3d.cc \
                  util/animation/animation_player.cc \
+                 util/object_manager.cc \
                  garbage_collector.cc \
                  story_entities/story_entity.cc \
@@ -61 +62 @@
                  world_entities/test_gun.cc \
                  world_entities/test_bullet.cc \
+                 world_entities/test_entity.cc \
                  ai/ai.cc \
                  lib/coord/p_node.cc \
@@ -71 +73 @@
                  lib/graphics/importer/array.cc \
                  lib/graphics/importer/objModel.cc \
+                 lib/graphics/importer/md2Model.cc \
                  lib/graphics/importer/primitive_model.cc \
                  lib/graphics/importer/model.cc \
@@ -107 +110 @@
                  util/animation/animation3d.h \
                  util/animation/animation_player.h \
+                 util/object_manager.h \
                  garbage_collector.h \
                  story_entities/story_entity.h \
@@ -126 +130 @@
                  world_entities/test_gun.h \
                  world_entities/test_bullet.h \
+                 world_entities/test_entity.h \
                  ai/ai.h \
                  network/synchronisable.h \
@@ -141 +146 @@
                  lib/graphics/light.h \
                  lib/graphics/text_engine.h \
+                 lib/graphics/importer/array.h \
+                 lib/graphics/importer/abstract_model.h \
+                 lib/graphics/importer/objModel.h \
+                 lib/graphics/importer/md2Model.h \
+                 lib/graphics/importer/primitive_model.h \
+                 lib/graphics/importer/model.h \
+                 lib/graphics/importer/material.h \
+                 lib/graphics/importer/texture.h \
                  lib/graphics/particles/particle_engine.h \
                  lib/graphics/particles/particle_system.h \

orxonox/trunk/src/Makefile.in

@@ -73 +73 @@
         track_manager.$(OBJEXT) track_node.$(OBJEXT) factory.$(OBJEXT) \
         animation.$(OBJEXT) animation3d.$(OBJEXT) \
-        animation_player.$(OBJEXT) garbage_collector.$(OBJEXT) \
-        story_entity.$(OBJEXT) campaign.$(OBJEXT) world.$(OBJEXT) \
-        world_entity.$(OBJEXT) player.$(OBJEXT) environment.$(OBJEXT) \
-        skysphere.$(OBJEXT) skybox.$(OBJEXT) terrain.$(OBJEXT) \
-        weapon.$(OBJEXT) projectile.$(OBJEXT) satellite.$(OBJEXT) \
+        animation_player.$(OBJEXT) object_manager.$(OBJEXT) \
+        garbage_collector.$(OBJEXT) story_entity.$(OBJEXT) \
+        campaign.$(OBJEXT) world.$(OBJEXT) world_entity.$(OBJEXT) \
+        player.$(OBJEXT) environment.$(OBJEXT) skysphere.$(OBJEXT) \
+        skybox.$(OBJEXT) terrain.$(OBJEXT) weapon.$(OBJEXT) \
+        projectile.$(OBJEXT) satellite.$(OBJEXT) \
         character_attributes.$(OBJEXT) test_gun.$(OBJEXT) \
-        test_bullet.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \
-        null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
+        test_bullet.$(OBJEXT) test_entity.$(OBJEXT) ai.$(OBJEXT) \
+        p_node.$(OBJEXT) null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
         data_tank.$(OBJEXT) graphics_engine.$(OBJEXT) light.$(OBJEXT) \
         text_engine.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
-        primitive_model.$(OBJEXT) model.$(OBJEXT) material.$(OBJEXT) \
-        texture.$(OBJEXT) particle_engine.$(OBJEXT) \
+        md2Model.$(OBJEXT) primitive_model.$(OBJEXT) model.$(OBJEXT) \
+        material.$(OBJEXT) texture.$(OBJEXT) particle_engine.$(OBJEXT) \
         particle_system.$(OBJEXT) particle_emitter.$(OBJEXT) \
         base_entity.$(OBJEXT) base_object.$(OBJEXT) \
@@ -125 +126 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_video.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/list.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/md2Model.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/model.Po ./$(DEPDIR)/null_parent.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/object_manager.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/particle_emitter.Po \
@@ -139 +142 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/substring.Po ./$(DEPDIR)/terrain.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/test_bullet.Po ./$(DEPDIR)/test_gun.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/test_bullet.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/test_entity.Po ./$(DEPDIR)/test_gun.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po ./$(DEPDIR)/texture.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/tinystr.Po ./$(DEPDIR)/tinyxml.Po \
@@ -290 +294 @@
                  util/animation/animation3d.cc \
                  util/animation/animation_player.cc \
+                 util/object_manager.cc \
                  garbage_collector.cc \
                  story_entities/story_entity.cc \
@@ -306 +311 @@
                  world_entities/test_gun.cc \
                  world_entities/test_bullet.cc \
+                 world_entities/test_entity.cc \
                  ai/ai.cc \
                  lib/coord/p_node.cc \
@@ -316 +322 @@
                  lib/graphics/importer/array.cc \
                  lib/graphics/importer/objModel.cc \
+                 lib/graphics/importer/md2Model.cc \
                  lib/graphics/importer/primitive_model.cc \
                  lib/graphics/importer/model.cc \
@@ -352 +359 @@
                  util/animation/animation3d.h \
                  util/animation/animation_player.h \
+                 util/object_manager.h \
                  garbage_collector.h \
                  story_entities/story_entity.h \
@@ -371 +379 @@
                  world_entities/test_gun.h \
                  world_entities/test_bullet.h \
+                 world_entities/test_entity.h \
                  ai/ai.h \
                  network/synchronisable.h \
@@ -386 +395 @@
                  lib/graphics/light.h \
                  lib/graphics/text_engine.h \
+                 lib/graphics/importer/array.h \
+                 lib/graphics/importer/abstract_model.h \
+                 lib/graphics/importer/objModel.h \
+                 lib/graphics/importer/md2Model.h \
+                 lib/graphics/importer/primitive_model.h \
+                 lib/graphics/importer/model.h \
+                 lib/graphics/importer/material.h \
+                 lib/graphics/importer/texture.h \
                  lib/graphics/particles/particle_engine.h \
                  lib/graphics/particles/particle_system.h \
@@ -546 +563 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p_node.Po@am__quote@
@@ -565 +584 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bullet.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_entity.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gun.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_engine.Po@am__quote@
@@ -819 +839 @@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation_player.obj `if test -f 'util/animation/animation_player.cc'; then $(CYGPATH_W) 'util/animation/animation_player.cc'; else $(CYGPATH_W) '$(srcdir)/util/animation/animation_player.cc'; fi`
 
+object_manager.o: util/object_manager.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object_manager.o -MD -MP -MF "$(DEPDIR)/object_manager.Tpo" -c -o object_manager.o `test -f 'util/object_manager.cc' || echo '$(srcdir)/'`util/object_manager.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/object_manager.Tpo" "$(DEPDIR)/object_manager.Po"; else rm -f "$(DEPDIR)/object_manager.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/object_manager.cc' object='object_manager.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/object_manager.Po' tmpdepfile='$(DEPDIR)/object_manager.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 object_manager.o `test -f 'util/object_manager.cc' || echo '$(srcdir)/'`util/object_manager.cc
+
+object_manager.obj: util/object_manager.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object_manager.obj -MD -MP -MF "$(DEPDIR)/object_manager.Tpo" -c -o object_manager.obj `if test -f 'util/object_manager.cc'; then $(CYGPATH_W) 'util/object_manager.cc'; else $(CYGPATH_W) '$(srcdir)/util/object_manager.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/object_manager.Tpo" "$(DEPDIR)/object_manager.Po"; else rm -f "$(DEPDIR)/object_manager.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/object_manager.cc' object='object_manager.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/object_manager.Po' tmpdepfile='$(DEPDIR)/object_manager.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 object_manager.obj `if test -f 'util/object_manager.cc'; then $(CYGPATH_W) 'util/object_manager.cc'; else $(CYGPATH_W) '$(srcdir)/util/object_manager.cc'; fi`
+
 story_entity.o: story_entities/story_entity.cc
 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT story_entity.o -MD -MP -MF "$(DEPDIR)/story_entity.Tpo" -c -o story_entity.o `test -f 'story_entities/story_entity.cc' || echo '$(srcdir)/'`story_entities/story_entity.cc; \
@@ -1059 +1095 @@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_bullet.obj `if test -f 'world_entities/test_bullet.cc'; then $(CYGPATH_W) 'world_entities/test_bullet.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_bullet.cc'; fi`
 
+test_entity.o: world_entities/test_entity.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_entity.o -MD -MP -MF "$(DEPDIR)/test_entity.Tpo" -c -o test_entity.o `test -f 'world_entities/test_entity.cc' || echo '$(srcdir)/'`world_entities/test_entity.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_entity.Tpo" "$(DEPDIR)/test_entity.Po"; else rm -f "$(DEPDIR)/test_entity.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_entity.cc' object='test_entity.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_entity.Po' tmpdepfile='$(DEPDIR)/test_entity.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 test_entity.o `test -f 'world_entities/test_entity.cc' || echo '$(srcdir)/'`world_entities/test_entity.cc
+
+test_entity.obj: world_entities/test_entity.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_entity.obj -MD -MP -MF "$(DEPDIR)/test_entity.Tpo" -c -o test_entity.obj `if test -f 'world_entities/test_entity.cc'; then $(CYGPATH_W) 'world_entities/test_entity.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_entity.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_entity.Tpo" "$(DEPDIR)/test_entity.Po"; else rm -f "$(DEPDIR)/test_entity.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_entity.cc' object='test_entity.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_entity.Po' tmpdepfile='$(DEPDIR)/test_entity.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 test_entity.obj `if test -f 'world_entities/test_entity.cc'; then $(CYGPATH_W) 'world_entities/test_entity.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_entity.cc'; fi`
+
 ai.o: ai/ai.cc
 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai.o -MD -MP -MF "$(DEPDIR)/ai.Tpo" -c -o ai.o `test -f 'ai/ai.cc' || echo '$(srcdir)/'`ai/ai.cc; \
@@ -1218 +1270 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objModel.obj `if test -f 'lib/graphics/importer/objModel.cc'; then $(CYGPATH_W) 'lib/graphics/importer/objModel.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/objModel.cc'; fi`
+
+md2Model.o: lib/graphics/importer/md2Model.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT md2Model.o -MD -MP -MF "$(DEPDIR)/md2Model.Tpo" -c -o md2Model.o `test -f 'lib/graphics/importer/md2Model.cc' || echo '$(srcdir)/'`lib/graphics/importer/md2Model.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/md2Model.Tpo" "$(DEPDIR)/md2Model.Po"; else rm -f "$(DEPDIR)/md2Model.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/md2Model.cc' object='md2Model.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/md2Model.Po' tmpdepfile='$(DEPDIR)/md2Model.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 md2Model.o `test -f 'lib/graphics/importer/md2Model.cc' || echo '$(srcdir)/'`lib/graphics/importer/md2Model.cc
+
+md2Model.obj: lib/graphics/importer/md2Model.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT md2Model.obj -MD -MP -MF "$(DEPDIR)/md2Model.Tpo" -c -o md2Model.obj `if test -f 'lib/graphics/importer/md2Model.cc'; then $(CYGPATH_W) 'lib/graphics/importer/md2Model.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/md2Model.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/md2Model.Tpo" "$(DEPDIR)/md2Model.Po"; else rm -f "$(DEPDIR)/md2Model.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/md2Model.cc' object='md2Model.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/md2Model.Po' tmpdepfile='$(DEPDIR)/md2Model.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 md2Model.obj `if test -f 'lib/graphics/importer/md2Model.cc'; then $(CYGPATH_W) 'lib/graphics/importer/md2Model.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/md2Model.cc'; fi`
 
 primitive_model.o: lib/graphics/importer/primitive_model.cc
@@ -1677 +1745 @@
 
 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/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
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -20 +20 @@
 
 #include "debug.h"
+#include "text_engine.h"
 
 using namespace std;
@@ -30 +31 @@
 GraphicsEngine::GraphicsEngine () 
 {
+  this->bDisplayFPS = false;
+  this->minFPS = 9999;
+  this->maxFPS = 0;
   this->setClassName ("GraphicsEngine");
 
@@ -278 +282 @@
       PRINT(4)(" |  %d x %d\n", this->videoModes[i]->w, this->videoModes[i]->h);
   }
-  
-}
+}
+
+
+void GraphicsEngine::tick(float dt)
+{
+        if( unlikely(this->bDisplayFPS))
+        {
+          this->currentFPS = 1.0/dt;
+      if( unlikely(this->currentFPS > this->maxFPS)) this->maxFPS = this->currentFPS;
+          if( unlikely(this->currentFPS < this->minFPS)) this->minFPS = this->currentFPS;
+          
+          char tmpChar1[20];
+          sprintf(tmpChar1, "Current:  %4.0f", this->currentFPS);
+          this->geTextCFPS->setText(tmpChar1);
+          char tmpChar2[20];
+          sprintf(tmpChar2, "Max:    %4.0f", this->maxFPS);
+          this->geTextMaxFPS->setText(tmpChar2);
+          char tmpChar3[20];
+          sprintf(tmpChar3, "Min:    %4.0f", this->minFPS);
+          this->geTextMinFPS->setText(tmpChar3);
+        }
+}
+  
+void GraphicsEngine::displayFPS(bool display)
+{
+        if( display)
+        {
+                this->geTextCFPS = TextEngine::getInstance()->createText("fonts/druid.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
+                this->geTextCFPS->setAlignment(TEXT_ALIGN_LEFT);
+                this->geTextCFPS->setPosition(5, 500);
+                this->geTextMaxFPS = TextEngine::getInstance()->createText("fonts/druid.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
+                this->geTextMaxFPS->setAlignment(TEXT_ALIGN_LEFT);
+                this->geTextMaxFPS->setPosition(5, 530);
+                this->geTextMinFPS = TextEngine::getInstance()->createText("fonts/druid.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
+                this->geTextMinFPS->setAlignment(TEXT_ALIGN_LEFT);
+                this->geTextMinFPS->setPosition(5, 560);        
+        }
+        this->bDisplayFPS = display;
+}
+
+  

orxonox/trunk/src/lib/graphics/graphics_engine.h

@@ -11 +11 @@
 
 #include "glincl.h"
-
 #include "base_object.h"
 
-// FORWARD DEFINITION \\
+
+class Text;
 
 
@@ -45 +45 @@
   static GLdouble projMat[16];
   static GLint viewPort[4];
-
+  
+  void tick(float dt);
+  void displayFPS(bool display);
 
 
@@ -59 +61 @@
   bool fullscreen;
   Uint32 videoFlags;
+  
+  bool bDisplayFPS;  //!< is true if the fps should be displayed
+  float currentFPS;  //!< the current frame rate: frames per seconds
+  float maxFPS;      //!< maximal frame rate we ever got since start of the game
+  float minFPS;      //!< minimal frame rate we ever got since start
+
+  Text* geTextCFPS;
+  Text* geTextMaxFPS;
+  Text* geTextMinFPS;
 
   SDL_Rect **videoModes;

orxonox/trunk/src/story_entities/world.cc

@@ -33 +33 @@
 #include "skybox.h"
 #include "satellite.h"
+#include "test_entity.h"
 #include "terrain.h"
 #include "light.h"
@@ -41 +42 @@
 #include "animation_player.h"
 #include "particle_engine.h"
+#include "graphics_engine.h"
 
 #include "command_node.h"
@@ -50 +52 @@
 
 #include "substring.h"
+
+
 
 using namespace std;
@@ -199 +203 @@
 
   delete WorldInterface::getInstance();
-
   delete this->nullParent;
   delete this->entities;
@@ -206 +209 @@
   delete this->particleEngine;
   TextEngine::getInstance()->flush();
-
   delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
   //delete garbagecollecor
@@ -258 +260 @@
   this->localCamera = new Camera();
   this->localCamera->setName ("camera");
+  
+  GraphicsEngine::getInstance()->displayFPS(true);
 }
 
@@ -388 +392 @@
   this->localPlayer->addChild (this->localCamera);
       
+
   lightMan->setAmbientColor(.1,.1,.1);
   lightMan->addLight();
@@ -395 +400 @@
   //  lightMan->setPosition(20, 10, -20);
   //  lightMan->setDiffuseColor(0,0,0);
-  lightMan->debug();
+  //lightMan->debug();
   lightMan->setPosition(-5.0, 10.0, -40.0);
   
@@ -416 +421 @@
   glNewList (objectList, GL_COMPILE);
   
-  trackManager->drawGraph(.01);
-  trackManager->debug(2);
+
+  //trackManager->drawGraph(.01);
+  //trackManager->debug(2);
   glEndList();
 
@@ -423 +429 @@
   terrain->setRelCoor(Vector(0,-10,0));
   this->spawn(terrain);
+
 
 
@@ -434 +441 @@
   
   particleEngine->addConnection(emitter, system);
-}
+
+  WorldEntity* testEntity = new TestEntity();
+  //testEntity->setRelCoor(Vector(570, 10, -15));
+  testEntity->setRelCoor(Vector(25, -10, -20));
+  testEntity->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
+  this->spawn(testEntity);
+  this->localPlayer->addChild(testEntity);
+}
+
 
 void World::loadDebugWorld(int worldID)
@@ -1136 +1151 @@
       this->trackManager->tick(this->dt);
       this->localCamera->tick(this->dt);
+      AnimationPlayer::getInstance()->tick(this->dtS);
+
+      particleEngine->tick(this->dtS);
       this->garbageCollector->tick(this->dtS);
-
-      AnimationPlayer::getInstance()->tick(this->dtS);
-      particleEngine->tick(this->dtS);
+          
+      /* actualy the Graphics Engine should tick the world not the other way around...
+         but since we like the things not too complicated we got it this way around
+         until there is need or time to do it the other way around.
+         \todo: GraphicsEngine ticks world: separation of processes and data...
+      */
+      GraphicsEngine::getInstance()->tick(this->dtS);
     }
   this->lastFrame = currentFrame;