Changeset 4066 in orxonox.OLD

Timestamp:

May 5, 2005, 8:59:01 PM (19 years ago)

Author:

patrick

Message:

orxonox/branches/md2_loader: now it displays the fps, will do this better an look for a good font.

Location:

orxonox/branches/md2_loader/src

Files:

• lib/graphics/graphics_engine.cc (modified) (3 diffs)
• lib/graphics/graphics_engine.h (modified) (3 diffs)
• story_entities/world.cc (modified) (3 diffs)

orxonox/branches/md2_loader/src/lib/graphics/graphics_engine.cc

@@ -19 +19 @@
 
 #include "debug.h"
+#include "text_engine.h"
 
 using namespace std;
@@ -29 +30 @@
 GraphicsEngine::GraphicsEngine () 
 {
+  this->bDisplayFPS = false;
   this->setClassName ("GraphicsEngine");
   this->initVideo();
@@ -263 +265 @@
   }
 }
-  
-void GraphicsEngine::displayFPS(bool dislay)
-{
-        PRINTF(4)("");
-        
-        
-}
-
-  
+
+
+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;
+          
+          // temporary, only for showing how fast the text-engine is
+          char tmpChar[20];
+          sprintf(tmpChar, "fps: %4.0f", this->currentFPS);
+          this->geText->setPosition(0, 500);
+          this->geText->setText(tmpChar);
+          //this->geText->setPosition(0, 420);
+          //this->geText->setText("TEST");
+        }
+}
+  
+void GraphicsEngine::displayFPS(bool display)
+{
+  this->geText = TextEngine::getInstance()->createText("fonts/earth.ttf", 30, TEXT_DYNAMIC, 0, 255, 0);
+  this->geText->setAlignment(TEXT_ALIGN_LEFT);
+  this->bDisplayFPS = display;
+}
+
+  

orxonox/branches/md2_loader/src/lib/graphics/graphics_engine.h

@@ -11 +11 @@
 
 #include "glincl.h"
-
 #include "base_object.h"
 
-// FORWARD DEFINITION \\
+
+class Text;
 
 
@@ -45 +45 @@
   static GLint viewPort[4];
   
-  void displayFPS(bool dislay);
+  void tick(float dt);
+  void displayFPS(bool display);
 
 
@@ -59 +60 @@
   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* geText;
 
   SDL_Rect **videoModes;

orxonox/branches/md2_loader/src/story_entities/world.cc

@@ -40 +40 @@
 #include "garbage_collector.h"
 #include "animation_player.h"
+#include "graphics_engine.h"
 
 #include "command_node.h"
@@ -258 +259 @@
   this->localCamera = new Camera();
   this->localCamera->setName ("camera");
+  
+  GraphicsEngine::getInstance()->displayFPS(true);
 }
 
@@ -1115 +1118 @@
       this->localCamera->tick(this->dt);
       this->garbageCollector->tick(seconds);
-
-      AnimationPlayer::getInstance()->tick(seconds);
+          
+          /* 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(seconds);
+          AnimationPlayer::getInstance()->tick(seconds);
     }
   this->lastFrame = currentFrame;