Changeset 2850 for code/branches/gui/src/orxonox/gui/GUIManager.h
- Timestamp:
- Mar 25, 2009, 11:53:04 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gui/src/orxonox/gui/GUIManager.h
r2840 r2850 40 40 #include <CEGUIInputEvent.h> 41 41 #include <CEGUISystem.h> 42 #include "core/Clock.h"43 42 #include "core/input/InputInterfaces.h" 44 43 … … 71 70 72 71 bool initialise(Ogre::RenderWindow* renderWindow); 73 void loadScene(const std::string& name);74 void update(const Clock& time)75 {76 assert(guiSystem_);77 guiSystem_->injectTimePulse(time.getDeltaTime());78 }79 void showGUI(const std::string& name, Ogre::SceneManager* sceneManager);// bool showBackground); // tolua_export80 void hideGUI(); // tolua_export81 //void testOutput(const std::string& str); // tolua_export82 72 83 static void toggleGUI(); 73 void update(const Clock& time); 74 75 void showGUI(const std::string& name); 76 void executeCode(const std::string& str); 84 77 85 78 void setCamera(Ogre::Camera* camera); 86 Ogre::Camera* getCamera() { return this->backgroundCamera_; }87 88 static void showGUI_s(const std::string& name, Ogre::SceneManager* sceneManager)//bool showBackground)89 {90 getInstance().showGUI(name, sceneManager);91 }92 93 // please remove94 //void testFct();95 79 96 80 static GUIManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; } // tolua_export … … 99 83 private: 100 84 GUIManager(const GUIManager& instance); 85 86 void loadLuaCode(); 101 87 102 88 void keyPressed (const KeyEvent& evt) … … 120 106 void updateMouse(float dt) { } 121 107 122 void loadScenes();123 124 //Ogre::SceneManager* emptySceneManager_;125 Ogre::SceneManager* backgroundSceneManager_;126 //Ogre::Camera* emptyCamera_;127 Ogre::Camera* backgroundCamera_;128 //Ogre::Viewport* viewport_;129 108 Ogre::RenderWindow* renderWindow_; 130 109 CEGUI::OgreCEGUIRenderer* guiRenderer_; … … 135 114 CEGUI::Imageset* backgroundImage_; 136 115 lua_State* luaState_; 137 Ogre::SceneManager* currentSceneManager_;138 116 139 117 State state_;
Note: See TracChangeset
for help on using the changeset viewer.