Changeset 8704 for code/branches/presentation

Timestamp:

Jun 13, 2011, 2:35:18 PM (13 years ago)

Author:

dafrick

Message:

Only escape [] in CEGUI tetx of version is ≥ 0.7

Location:

code/branches/presentation

Files:

• data/gui/scripts/NotificationLayer.lua (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (1 diff)
• src/libraries/core/GUIManager.h (modified) (2 diffs)

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

@@ -62 +62 @@
     end
 
-    notification = string.gsub(notification, "%[", "\\%[") -- escape '[' which is used to format text since cegui 0.7
+    if not guiMgr:usingOldCEGUI() then
+        notification = string.gsub(notification, "%[", "\\%[") -- escape '[' which is used to format text since cegui 0.7
+    end
 
     local item = winMgr:createWindow("MenuWidgets/StaticText", "orxonox/NotificationLayer/Root/Queue/" .. queueName .. "/" .. queue.last)

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

@@ -262 +262 @@
         COUT(3) << "Initialising CEGUI." << std::endl;
 
+        this->oldCEGUI_ = false;
+        
         // Note: No SceneManager specified yet
 #ifdef ORXONOX_OLD_CEGUI
         guiRenderer_ = new OgreCEGUIRenderer(GraphicsManager::getInstance().getRenderWindow(), Ogre::RENDER_QUEUE_OVERLAY, false, 3000);
         resourceProvider_ = guiRenderer_->createResourceProvider();
+        this->oldCEGUI_ = true;
 #else
         guiRenderer_ = &OgreRenderer::create(*GraphicsManager::getInstance().getRenderWindow());

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

@@ -134 +134 @@
 
         static GUIManager& getInstance() { return Singleton<GUIManager>::getInstance(); } // tolua_export
+
+        /**
+        @brief Check whether CEGUI is version < 0.7.
+        @return Returns true if the CEGUI version is < 0.7. False otherwise.
+        */
+        inline bool usingOldCEGUI(void) { return this->oldCEGUI_; } // tolua_export
 
     private:
@@ -186 +192 @@
         static const std::string defaultScheme_;
         std::string guiScheme_;
-
+        bool oldCEGUI_;
+        
         int numScrollLines_; ///< How many lines to scroll in a list if the scroll wheel is used