Changeset 1451 for code/branches

Timestamp:

May 28, 2008, 2:39:46 PM (17 years ago)

Author:

FelixSchulthess

Message:

possible to toggle FPS and Render time display with F1 and F2

Location:

code/branches/network

Files:

• bin/def_keybindings.ini (modified) (1 diff)
• src/orxonox/hud/HUD.cc (modified) (4 diffs)
• src/orxonox/hud/HUD.h (modified) (3 diffs)

code/branches/network/bin/def_keybindings.ini

@@ -59 +59 @@
 KeySPACE=
 KeyCAPITAL=
-KeyF1=
-KeyF2=
+KeyF1=toggleFPS
+KeyF2=toggleRenderTime
 KeyF3=
 KeyF4=

code/branches/network/src/orxonox/hud/HUD.cc

@@ -48 +48 @@
 {
     SetConsoleCommandShortcut(HUD, cycleNavigationFocus).setAccessLevel(AccessLevel::User);
+    SetConsoleCommandShortcut(HUD, toggleFPS).setAccessLevel(AccessLevel::User);
+    SetConsoleCommandShortcut(HUD, toggleRenderTime).setAccessLevel(AccessLevel::User);
 
     using namespace Ogre;
@@ -56 +58 @@
         firstRadarObject = NULL;
         lastRadarObject = NULL;
+        showFPS = true;
+        showRenderTime = true;
 
         // create Factories
@@ -147 +151 @@
         nav->update();
 
-        float fps = GraphicsEngine::getSingleton().getAverageFPS();
-        fpsText->setCaption("FPS: " + Ogre::StringConverter::toString(fps));
+        setFPS();
     }
 
     void HUD::setRenderTimeRatio(float ratio)
     {
-      rTRText->setCaption("Render time ratio: " + Ogre::StringConverter::toString(ratio));
+        if(showRenderTime){
+            rTRText->setCaption("Render time ratio: " + Ogre::StringConverter::toString(ratio));
+        }
+        else{
+            rTRText->setCaption("");
+            return;
+        }
+    }
+
+    void HUD::setFPS(){
+        if(showFPS){
+            float fps = GraphicsEngine::getSingleton().getAverageFPS();
+            fpsText->setCaption("FPS: " + Ogre::StringConverter::toString(fps));
+        }
+        else{
+            fpsText->setCaption("");
+            return;
+        }
     }
 
@@ -184 +204 @@
         HUD::getSingleton().nav->cycleFocus();
     }
+
+    /*static*/ void HUD::toggleFPS(){
+        if(HUD::getSingleton().showFPS) HUD::getSingleton().showFPS = false;
+        else HUD::getSingleton().showFPS = true;
+    }
+
+    /*static*/ void HUD::toggleRenderTime(){
+        if(HUD::getSingleton().showRenderTime) HUD::getSingleton().showRenderTime = false;
+        else HUD::getSingleton().showRenderTime = true;
+    }
 }
 

code/branches/network/src/orxonox/hud/HUD.h

@@ -59 +59 @@
         Navigation* nav;
 
+        bool showFPS;
+        bool showRenderTime;
+
       public:
         virtual void tick(float);
@@ -64 +67 @@
         RadarObject* getFirstRadarObject();
         void setRenderTimeRatio(float ratio);
+        void setFPS();
 
         static HUD* instance_s;
@@ -69 +73 @@
         static void setEnergy(float value);
         static void cycleNavigationFocus();
+        static void toggleFPS();
+        static void toggleRenderTime();
     };
 }