Changeset 1374 for code/trunk

Timestamp:

May 22, 2008, 3:57:27 PM (17 years ago)

Author:

FelixSchulthess

Message:

added fps counter

Location:

code/trunk

Files:

• bin/keybindings.ini (modified) (3 diffs)
• src/orxonox/Orxonox.cc (modified) (1 diff)
• src/orxonox/hud/HUD.cc (modified) (3 diffs)
• src/orxonox/hud/HUD.h (modified) (2 diffs)

code/trunk/bin/keybindings.ini

@@ -1 +1 @@
 [KeyBinder]
-KeyUNASSIGNED=
+KeyUNASSIGNED=activateConsole
 KeyESCAPE=exit
 Key1=
@@ -15 +15 @@
 KeyEQUALS=activateConsole
 KeyBACK=
-KeyTAB=cycleFocus
+KeyTAB=
 KeyQ=
 KeyW=
@@ -154 +154 @@
 MouseButton6=
 MouseButton7=
-MouseWheel1Up=AxisAmp 0.1 slomo
-MouseWheel1Down=AxisAmp 0.1 slomo
+MouseWheel1Up=
+MouseWheel1Down=
 MouseWheel2Up=
 MouseWheel2Down=

code/trunk/src/orxonox/Orxonox.cc

@@ -487 +487 @@
 //      orxonoxHUD_->setRocket2(ogreRoot.getCurrentFrameNumber());
       if (eventTimes[3].back() - eventTimes[3].front() != 0)
-//        orxonoxHUD_->setRocket1((int)(50000.0f/(eventTimes[3].back() - eventTimes[3].front())));
+        orxonoxHUD_->setFPS(50000.0f/(eventTimes[3].back() - eventTimes[3].front()));
 
       // Iterate through all Tickables and call their tick(dt) function

code/trunk/src/orxonox/hud/HUD.cc

@@ -60 +60 @@
         test->show();
         test->setMetricsMode(Ogre::GMM_RELATIVE);
-        test->setDimensions(0.8, 0.8);
+        test->setDimensions(0.3, 0.3);
         test->setPosition(0.02, 0.02);
         test->setFontName("Console");
         test->setCaption("init");
+
+        // test2
+        fpsText = static_cast<TextAreaOverlayElement*>(om->createOverlayElement("TextArea", "fpsText"));
+        fpsText->show();
+        fpsText->setMetricsMode(Ogre::GMM_RELATIVE);
+        fpsText->setDimensions(0.3, 0.3);
+        fpsText->setPosition(0.9, 0.02);
+        fpsText->setFontName("Console");
+        fpsText->setCaption("init");
 
         // create energy bar
@@ -86 +95 @@
         container->setMetricsMode(Ogre::GMM_RELATIVE);
         container->addChild(test);
+        container->addChild(fpsText);
         energyBar->init(0.01, 0.94, 0.4, container);
         energyBar->setValue(1);
@@ -113 +123 @@
     }
 
+    void HUD::setFPS(float fps){
+        fpsText->setCaption("FPS: " + Ogre::StringConverter::toString(fps));
+    }
+
     HUD::~HUD(void){
     }

code/trunk/src/orxonox/hud/HUD.h

@@ -50 +50 @@
             Ogre::OverlayContainer* container;
             Ogre::TextAreaOverlayElement* test;
+            Ogre::TextAreaOverlayElement* fpsText;
             BarOverlayElement* energyBar;
             BarOverlayElement* speedoBar;
@@ -57 +58 @@
             HUD(int zoom);
             ~HUD();
+            void setFPS(float fps);
             virtual void tick(float);