Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 25, 2009, 11:53:04 PM (16 years ago)
Author:
rgrieder
Message:
  • Started working on cleaning up the GameState mess ;)
  • Cleaned out GUIManager
  • Renamed GSGUI to GSMainMenu
  • "—state blah" has been changed to —server, —client, —standalone, —dedicated
  • —console starts the game in the console (no level loading there yet, but "loadMenu")
  • adjusted run scripts
File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/gui/src/orxonox/gui/GUIManager.h

    r2840 r2850  
    4040#include <CEGUIInputEvent.h>
    4141#include <CEGUISystem.h>
    42 #include "core/Clock.h"
    4342#include "core/input/InputInterfaces.h"
    4443
     
    7170
    7271        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_export
    80         void hideGUI(); // tolua_export
    81         //void testOutput(const std::string& str); // tolua_export
    8272
    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);
    8477
    8578        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 remove
    94         //void testFct();
    9579
    9680        static GUIManager& getInstance()    { assert(singletonRef_s); return *singletonRef_s; } // tolua_export
     
    9983    private:
    10084        GUIManager(const GUIManager& instance);
     85
     86        void loadLuaCode();
    10187
    10288        void keyPressed (const KeyEvent& evt)
     
    120106        void updateMouse(float dt) { }
    121107
    122         void loadScenes();
    123 
    124         //Ogre::SceneManager*       emptySceneManager_;
    125         Ogre::SceneManager*       backgroundSceneManager_;
    126         //Ogre::Camera*             emptyCamera_;
    127         Ogre::Camera*             backgroundCamera_;
    128         //Ogre::Viewport*           viewport_;
    129108        Ogre::RenderWindow*       renderWindow_;
    130109        CEGUI::OgreCEGUIRenderer* guiRenderer_;
     
    135114        CEGUI::Imageset*          backgroundImage_;
    136115        lua_State*                luaState_;
    137         Ogre::SceneManager*         currentSceneManager_;
    138116
    139117        State state_;
Note: See TracChangeset for help on using the changeset viewer.