Changeset 6105 for code/trunk/src/libraries/core/GUIManager.cc
- Timestamp:
- Nov 20, 2009, 4:55:40 PM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/console (added) merged: 5941,5945,5968-5975,5983,5985-5986,5991-5992,5994-5996,5998,6000,6004-6007,6010-6017,6034,6037,6041,6043-6044,6089,6103-6104
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/core/GUIManager.cc
r5929 r6105 53 53 #include "util/Exception.h" 54 54 #include "util/OrxAssert.h" 55 #include "Core.h"56 55 #include "LuaState.h" 57 56 #include "PathConfig.h" … … 75 74 default: OrxAssert(false, "CEGUI log level out of range, inpect immediately!"); 76 75 } 77 OutputHandler::getOutStream( ).setOutputLevel(orxonoxLevel)76 OutputHandler::getOutStream(orxonoxLevel) 78 77 << "CEGUI: " << message << std::endl; 79 78 … … 121 120 // set the log level according to ours (translate by subtracting 1) 122 121 ceguiLogger->setLoggingLevel( 123 static_cast<LoggingLevel>( Core::getSoftDebugLevel(OutputHandler::LD_Logfile) - 1));122 static_cast<LoggingLevel>(OutputHandler::getInstance().getSoftDebugLevel("logFile") - 1)); 124 123 this->ceguiLogger_ = ceguiLogger.release(); 125 124 … … 127 126 guiSystem_.reset(new System(guiRenderer_.get(), resourceProvider_, 0, scriptModule_.get())); 128 127 129 // Initialise the basic lua code128 // Initialise the basic Lua code 130 129 rootFileInfo_ = Resource::getInfo("InitialiseGUI.lua", "GUI"); 131 130 this->luaState_->doFile("InitialiseGUI.lua", "GUI", false); … … 134 133 guiSystem_->injectMousePosition(mousePosition.first, mousePosition.second); 135 134 136 // Hide the mouse cursor unless playing in full screen mode135 // Hide the mouse cursor unless playing in full screen mode 137 136 if (!bFullScreen) 138 137 CEGUI::MouseCursor::getSingleton().hide(); … … 280 279 code of the mouse button as it is used by CEGUI 281 280 282 Simple conver tion from mouse event code in Orxonox to the one used in CEGUI.281 Simple conversion from mouse event code in Orxonox to the one used in CEGUI. 283 282 */ 284 283 static inline CEGUI::MouseButton convertButton(MouseButtonCode::ByEnum button)
Note: See TracChangeset
for help on using the changeset viewer.