Changeset 7993 for code/branches/usability

Timestamp:

Feb 27, 2011, 6:26:37 PM (14 years ago)

Author:

landauf

Message:

moved fpsLimit_ config value to GraphicsSettings (seems more intuitive)
disabled fps limit if VSync is active (limits the fps anyway, but to the monitors refresh rate)

Location:

code/branches/usability/src/libraries/core

Files:

• Game.cc (modified) (3 diffs)
• GraphicsManager.cc (modified) (2 diffs)
• GraphicsManager.h (modified) (1 diff)

code/branches/usability/src/libraries/core/Game.cc

@@ -50 +50 @@
 #include "GameMode.h"
 #include "GameState.h"
+#include "GraphicsManager.h"
 #include "GUIManager.h"
 #include "command/ConsoleCommand.h"
@@ -142 +143 @@
         SetConfigValue(statisticsAvgLength_, 1000000)
             .description("Sets the time in microseconds interval at which average fps, etc. gets calculated.");
-        SetConfigValue(fpsLimit_, 50)
+
+        SetConfigValueExternal(fpsLimit_, "GraphicsSettings", "fpsLimit", 50)
             .description("Sets the desired frame rate (0 for no limit).");
     }
@@ -207 +209 @@
 
             // Limit frame rate
-            this->updateFPSLimiter();
+            static bool hasVSync = GraphicsManager::getInstance().hasVSyncEnabled(); // can be static since changes of VSync currently require a restart
+            if (this->fpsLimit_ > 0 && !hasVSync)
+                this->updateFPSLimiter();
         }
 

code/branches/usability/src/libraries/core/GraphicsManager.cc

@@ -318 +318 @@
         CCOUT(4) << "Configuring Renderer" << std::endl;
 
-        if (!ogreRoot_->restoreConfig() || Core::getInstance().getOgreConfigTimestamp() > Core::getInstance().getLastLevelTimestamp())
+        bool updatedConfig = Core::getInstance().getOgreConfigTimestamp() > Core::getInstance().getLastLevelTimestamp();
+        if (updatedConfig)
+            COUT(2) << "Ogre config file has changed, but no level was started since then. Displaying config dialogue again to verify the changes." << std::endl;
+
+        if (!ogreRoot_->restoreConfig() || updatedConfig)
         {
             if (!ogreRoot_->showConfigDialog())
@@ -466 +470 @@
     }
 
+    bool GraphicsManager::hasVSyncEnabled() const
+    {
+        Ogre::ConfigOptionMap& options = ogreRoot_->getRenderSystem()->getConfigOptions();
+        if (options.find("VSync") != options.end())
+            return (options["VSync"].currentValue == "Yes");
+        else
+            return false;
+    }
+
     std::string GraphicsManager::setScreenResolution(unsigned int width, unsigned int height, bool fullscreen)
     {

code/branches/usability/src/libraries/core/GraphicsManager.h

@@ -75 +75 @@
         size_t getRenderWindowHandle();
         bool isFullScreen() const;
+        bool hasVSyncEnabled() const;
 
         void upgradeToGraphics();