Changeset 7760

Timestamp:

Dec 15, 2010, 10:59:10 AM (14 years ago)

Author:

dafrick

Message:

Making the GUI scheme configurable through a config value.

Location:

code/branches/presentation

Files:

• data/gui/schemes/OrxonoxHUDWidgets.scheme (moved) (moved from code/branches/presentation/data/gui/schemes/OrxonoxLookHUDWidgets.scheme) (1 diff)
• data/gui/schemes/OrxonoxMenuWidgets.scheme (moved) (moved from code/branches/presentation/data/gui/schemes/OrxonoxLookMenuWidgets.scheme) (1 diff)
• data/gui/scripts/InitialiseGUI.lua (modified) (2 diffs)
• src/libraries/core/GUIManager.cc (modified) (4 diffs)
• src/libraries/core/GUIManager.h (modified) (4 diffs)

code/branches/presentation/data/gui/schemes/OrxonoxHUDWidgets.scheme

@@ -1 +1 @@
 <?xml version="1.0" ?>
-<GUIScheme Name="OrxonoxLookHUDWidgets">
+<GUIScheme Name="OrxonoxHUDWidgets">
     <WindowAlias Alias="HUDWidgets/StaticImage"              Target="OrxonoxLook/StaticImage" />
     <WindowAlias Alias="HUDWidgets/StaticText"               Target="OrxonoxLook/StaticText" />

code/branches/presentation/data/gui/schemes/OrxonoxMenuWidgets.scheme

@@ -1 +1 @@
 <?xml version="1.0" ?>
-<GUIScheme Name="OrxonoxLookMenuWidgets">
+<GUIScheme Name="OrxonoxMenuWidgets">
     <WindowAlias Alias="MenuWidgets/StaticImage"              Target="OrxonoxLook/StaticImage" />
     <WindowAlias Alias="MenuWidgets/StaticText"               Target="OrxonoxLook/StaticText" />

code/branches/presentation/data/gui/scripts/InitialiseGUI.lua

@@ -5 +5 @@
 winMgr    = CEGUI.WindowManager:getSingleton()
 
+local scheme = orxonox.CommandExecutor:query("getConfig GUIManager guiScheme_")
 -- Load all required skins
-schemeMgr:loadScheme("TaharezGreenLook.scheme")
---schemeMgr:loadScheme("OrxonoxLook.scheme")
+--schemeMgr:loadScheme("TaharezGreenLook.scheme")
+schemeMgr:loadScheme(scheme .. "Look.scheme")
 --schemeMgr:loadScheme("TaharezLook.scheme")
 --schemeMgr:loadScheme("WindowsLook.scheme")
@@ -16 +17 @@
 -- By loading a different file (if there is) you can change the skin
 -- of the menus or the HUD independently
-schemeMgr:loadScheme("TaharezGreenMenuWidgets.scheme")
-menuImageSet = "TaharezGreenLook"
-schemeMgr:loadScheme("TaharezGreenHUDWidgets.scheme")
-hudImageSet = "TaharezGreenLook"
---schemeMgr:loadScheme("OrxonoxLookMenuWidgets.scheme")
---menuImageSet = "OrxonoxLook"
---schemeMgr:loadScheme("OrxonoxLookHUDWidgets.scheme")
---hudImageSet = "OrxonoxLook"
+--schemeMgr:loadScheme("TaharezGreenMenuWidgets.scheme")
+--menuImageSet = "TaharezGreenLook"
+--schemeMgr:loadScheme("TaharezGreenHUDWidgets.scheme")
+--hudImageSet = "TaharezGreenLook"
+schemeMgr:loadScheme(scheme .. "MenuWidgets.scheme")
+menuImageSet = scheme .. "Look"
+schemeMgr:loadScheme(scheme .. "HUDWidgets.scheme")
+hudImageSet = scheme .. "Look"
 
 -- Just a remaining test hack

code/branches/presentation/src/libraries/core/GUIManager.cc

@@ -59 +59 @@
 #include "util/Exception.h"
 #include "util/OrxAssert.h"
+#include "ConfigValueIncludes.h"
 #include "Core.h"
+#include "CoreIncludes.h"
 #include "GraphicsManager.h"
 #include "LuaState.h"
@@ -100 +102 @@
 
     GUIManager* GUIManager::singletonPtr_s = 0;
+    /*static*/ const std::string GUIManager::defaultScheme_ = "TaharezGreen";
 
     SetConsoleCommand("showGUI", &GUIManager::showGUI).defaultValue(1, false).defaultValue(2, false);
@@ -118 +121 @@
         , camera_(NULL)
     {
+        RegisterRootObject(GUIManager);
+        this->setConfigValues();
+
         using namespace CEGUI;
 
@@ -175 +181 @@
     GUIManager::~GUIManager()
     {
+    }
+
+    void GUIManager::setConfigValues(void)
+    {
+        SetConfigValue(guiScheme_, GUIManager::defaultScheme_) .description("Changes the current GUI scheme.") .callback(this, &GUIManager::changedGUIScheme);
+    }
+
+    void GUIManager::changedGUIScheme(void)
+    {
+        
     }
 

code/branches/presentation/src/libraries/core/GUIManager.h

@@ -49 +49 @@
 #include "util/Singleton.h"
 #include "input/InputHandler.h"
+#include "OrxonoxClass.h"
 
 // Tolua includes (have to be relative to the current directory)
@@ -70 +71 @@
     */
     class _CoreExport GUIManager // tolua_export
-        : public Singleton<GUIManager>, public InputHandler
+        : public Singleton<GUIManager>, public InputHandler, public OrxonoxClass
     { // tolua_export
         friend class Singleton<GUIManager>;
@@ -76 +77 @@
         GUIManager(const std::pair<int, int>& mousePosition);
         ~GUIManager();
+
+        void setConfigValues(void);
+        void changedGUIScheme(void);
 
         void preUpdate(const Clock& time);
@@ -143 +147 @@
         static GUIManager*                   singletonPtr_s;    //!< Singleton reference to GUIManager
 
+        // The used CEGUI scheme.
+        static const std::string defaultScheme_;
+        std::string guiScheme_;
+
     }; // tolua_export
 } // tolua_export