Changeset 2664 for code/branches/buildsystem3/src/orxonox/gui
- Timestamp:
- Feb 14, 2009, 10:53:45 PM (16 years ago)
- Location:
- code/branches/buildsystem3
- Files:
-
- 6 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/buildsystem3
- Property svn:ignore deleted
- Property svn:mergeinfo changed
-
code/branches/buildsystem3/src/orxonox/gui/CMakeLists.txt
r2131 r2664 1 SET(SRC_FILES1 ADD_SOURCE_FILES(ORXONOX_SRC_FILES 2 2 GUIManager.cc 3 OgreCEGUIRenderer.cpp4 OgreCEGUIResourceProvider.cpp5 OgreCEGUITexture.cpp6 3 ) 7 8 ADD_SOURCE_FILES(SRC_FILES) -
code/branches/buildsystem3/src/orxonox/gui/GUIManager.cc
r2662 r2664 39 39 #include <OgreRoot.h> 40 40 #include <CEGUI.h> 41 #include "ceguilua/CEGUILua.h" 41 #include <ogreceguirenderer/OgreCEGUIRenderer.h> 42 #ifdef CEGUILUA_USE_INTERNAL_LIBRARY 43 # include <ceguilua/CEGUILua.h> 44 #else 45 # include <CEGUILua.h> 46 #endif 47 42 48 #include "util/Exception.h" 43 49 #include "core/input/InputManager.h" 44 50 #include "core/input/SimpleInputState.h" 45 #include "core/tolua/tolua_bind.h"46 51 #include "core/ConsoleCommand.h" 47 52 #include "core/Core.h" 48 #include "tolua/tolua_bind.h" 49 #include "OgreCEGUIRenderer.h" 50 51 #include "lua/lua.hpp" 53 #include "ToluaBindCore.h" 54 #include "ToluaBindOrxonox.h" 55 56 extern "C" { 57 #include <lua.h> 58 } 52 59 53 60 namespace orxonox … … 100 107 lua_pushnil(luaState_); 101 108 lua_setglobal(luaState_, "Core"); 102 // TODO: deleting the script module fails an assert ation.109 // TODO: deleting the script module fails an assertion. 103 110 // However there is not much we can do about it since it occurs too when 104 111 // we don't open Core or Orxonox. Might be a CEGUI issue. -
code/branches/buildsystem3/src/orxonox/gui/GUIManager.h
r1887 r2664 42 42 #include "core/input/InputInterfaces.h" 43 43 44 namespace orxonox // tolua_export 45 { // tolua_export 44 // tolua_begin 45 namespace orxonox 46 { 46 47 /** 47 48 @brief 48 49 Provides a simple interface to CEGUI with tolua methods and console commands 49 50 */ 50 class _OrxonoxExport GUIManager : public KeyHandler, public MouseHandler51 /* 52 class GUIManager { // tolua_export53 */ 51 class _OrxonoxExport GUIManager 52 // tolua_end 53 : public KeyHandler, public MouseHandler 54 // tolua_begin 54 55 { 56 // tolua_end 55 57 public: 56 58 enum State
Note: See TracChangeset
for help on using the changeset viewer.