Changeset 7801 for code/trunk/src/libraries/core

Timestamp:

Dec 22, 2010, 7:24:24 PM (14 years ago)

Author:

dafrick

Message:

Merging presentation2 branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/GUIManager.cc (modified) (4 diffs)
• src/libraries/core/GUIManager.h (modified) (4 diffs)

code/trunk/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/trunk/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