Changeset 7870 for code/trunk

Timestamp:

Feb 12, 2011, 7:24:16 PM (14 years ago)

Author:

landauf

Message:

added feature: ogre config dialog keeps showing up on startup until the user loads a level the first time.

the reason is: if the user closes the game (or it crashes) before loading a level, there was maybe a problem with the ogre config, so we show the menu again to modify it.
if the user manages to start a level, at least the menu shows correctly, hence he can change the config in the orxonox settings from now on if needed.

Location:

code/trunk/src

Files:

• libraries/core/Core.cc (modified) (3 diffs)
• libraries/core/Core.h (modified) (2 diffs)
• libraries/core/GraphicsManager.cc (modified) (2 diffs)
• orxonox/gamestates/GSLevel.cc (modified) (2 diffs)

code/trunk/src/libraries/core/Core.cc

@@ -94 +94 @@
         , bGraphicsLoaded_(false)
         , bStartIOConsole_(true)
+        , lastLevelTimestamp_(0)
+        , ogreConfigTimestamp_(0)
     {
         // Set the hard coded fixed paths
@@ -221 +223 @@
         SetConfigValue(bStartIOConsole_, true)
             .description("Set to false if you don't want to use the IOConsole (for Lua debugging for instance)");
+        SetConfigValue(lastLevelTimestamp_, 0)
+            .description("Timestamp when the last level was started.");
+        SetConfigValue(ogreConfigTimestamp_, 0)
+            .description("Timestamp when the ogre config file was changed.");
     }
 
@@ -395 +401 @@
         }
     }
+
+    void Core::updateLastLevelTimestamp()
+    {
+        ModifyConfigValue(lastLevelTimestamp_, set, static_cast<long long>(time(NULL)));
+    }
+
+    void Core::updateOgreConfigTimestamp()
+    {
+        ModifyConfigValue(ogreConfigTimestamp_, set, static_cast<long long>(time(NULL)));
+    }
 }

code/trunk/src/libraries/core/Core.h

@@ -83 +83 @@
             void resetLanguage();
 
+            void updateLastLevelTimestamp();
+            inline long long getLastLevelTimestamp() const
+                { return this->lastLevelTimestamp_; }
+
+            void updateOgreConfigTimestamp();
+            inline long long getOgreConfigTimestamp() const
+                { return this->ogreConfigTimestamp_; }
+
         private:
             Core(const Core&); //!< Don't use (undefined symbol)
@@ -120 +128 @@
             bool                          bInitRandomNumberGenerator_; //!< If true, srand(time(0)) is called
             bool                          bStartIOConsole_;            //!< Set to false if you don't want to use the IOConsole
+            long long                     lastLevelTimestamp_;         ///< Timestamp when the last level was started
+            long long                     ogreConfigTimestamp_;        ///< Timestamp wehen the ogre config level was modified
 
             static Core*                  singletonPtr_s;

code/trunk/src/libraries/core/GraphicsManager.cc

@@ -54 +54 @@
 #include "ConfigValueIncludes.h"
 #include "CoreIncludes.h"
+#include "Core.h"
 #include "Game.h"
 #include "GameMode.h"
@@ -303 +304 @@
         CCOUT(4) << "Configuring Renderer" << std::endl;
 
-        if (!ogreRoot_->restoreConfig())
+        if (!ogreRoot_->restoreConfig() || Core::getInstance().getOgreConfigTimestamp() > Core::getInstance().getLastLevelTimestamp())
+        {
             if (!ogreRoot_->showConfigDialog())
                 ThrowException(InitialisationFailed, "OGRE graphics configuration dialogue canceled.");
+            else
+                Core::getInstance().updateOgreConfigTimestamp();
+        }
 
         CCOUT(4) << "Creating render window" << std::endl;

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -36 +36 @@
 #include "core/input/InputState.h"
 #include "core/input/KeyBinderManager.h"
+#include "core/Core.h"
 #include "core/Game.h"
 #include "core/GameMode.h"
@@ -140 +141 @@
         startFile_ = new XMLFile(LevelManager::getInstance().getDefaultLevel());
         Loader::open(startFile_);
+
+        Core::getInstance().updateLastLevelTimestamp();
     }