Changeset 1653 for code/branches/gui

Timestamp:

Aug 5, 2008, 9:50:26 PM (16 years ago)

Author:

rgrieder

Message:

• getInstance is probably more suitable than getSingleton (as x3n has already done so in most of his classes) I changed it in Orxonox and GraphicsEngine. Maybe more to come.
• Removed derivation from BaseObject in InputState (templates work well too, don't need a factory at all)

Location:

code/branches/gui/src

Files:

• core/input/ExtendedInputState.cc (modified) (1 diff)
• core/input/ExtendedInputState.h (modified) (2 diffs)
• core/input/InputManager.cc (modified) (2 diffs)
• core/input/InputManager.h (modified) (1 diff)
• core/input/InputState.h (modified) (2 diffs)
• core/input/KeyDetector.cc (modified) (1 diff)
• core/input/SimpleInputState.cc (modified) (2 diffs)
• core/input/SimpleInputState.h (modified) (1 diff)
• orxonox/GraphicsEngine.cc (modified) (12 diffs)
• orxonox/GraphicsEngine.h (modified) (2 diffs)
• orxonox/Orxonox.cc (modified) (5 diffs)
• orxonox/Orxonox.h (modified) (2 diffs)
• orxonox/OrxonoxPrereqs.h (modified) (2 diffs)
• orxonox/gui/GUIManager.cc (modified) (4 diffs)
• orxonox/gui/GUIManager.h (modified) (1 diff)
• orxonox/objects/Ambient.cc (modified) (2 diffs)
• orxonox/objects/Backlight.cc (modified) (2 diffs)
• orxonox/objects/Camera.cc (modified) (2 diffs)
• orxonox/objects/CameraHandler.cc (modified) (1 diff)
• orxonox/objects/ParticleSpawner.cc (modified) (1 diff)
• orxonox/objects/Skybox.cc (modified) (2 diffs)
• orxonox/objects/WorldEntity.cc (modified) (4 diffs)
• orxonox/overlays/OrxonoxOverlay.cc (modified) (1 diff)
• orxonox/overlays/console/InGameConsole.cc (modified) (2 diffs)
• orxonox/overlays/debug/DebugFPSText.cc (modified) (1 diff)
• orxonox/overlays/debug/DebugRTRText.cc (modified) (1 diff)
• orxonox/tools/BillboardSet.cc (modified) (5 diffs)
• orxonox/tools/Light.cc (modified) (2 diffs)
• orxonox/tools/Mesh.cc (modified) (2 diffs)
• orxonox/tools/ParticleInterface.cc (modified) (2 diffs)

code/branches/gui/src/core/input/ExtendedInputState.cc

@@ -37 +37 @@
 #include <assert.h>
 #include "core/Debug.h"
-#include "core/CoreIncludes.h"
 
 namespace orxonox
 {
-    CreateFactory(ExtendedInputState);
-
     using namespace InputDevice;
-
-    ExtendedInputState::ExtendedInputState()
-    {
-        RegisterObject(ExtendedInputState);
-    }
 
     void ExtendedInputState::numberOfJoySticksChanged(unsigned int n)

code/branches/gui/src/core/input/ExtendedInputState.h

@@ -48 +48 @@
     {
         friend class InputManager;
-        friend class ClassFactory<ExtendedInputState>;
 
     public:
@@ -68 +67 @@
 
     private:
-        ExtendedInputState();
+        ExtendedInputState() { }
         ~ExtendedInputState() { }
 

code/branches/gui/src/core/input/InputManager.cc

@@ -161 +161 @@
             setConfigValues();
 
-            stateEmpty_ = createSimpleInputState("empty", -1);
+            stateEmpty_ = createInputState<SimpleInputState>("empty", -1);
             stateEmpty_->setHandler(new EmptyHandler());
             activeStates_[stateEmpty_->getPriority()] = stateEmpty_;
 
-            stateDetector_ = createSimpleInputState("detector", 101);
+            stateDetector_ = createInputState<SimpleInputState>("detector", 101);
             KeyDetector* temp = new KeyDetector();
             temp->loadBindings("storeKeyStroke");
             stateDetector_->setHandler(temp);
 
-            stateCalibrator_ = createSimpleInputState("calibrator", 100);
+            stateCalibrator_ = createInputState<SimpleInputState>("calibrator", 100);
             stateCalibrator_->setHandler(new EmptyHandler());
             InputBuffer* buffer = new InputBuffer();
@@ -1037 +1037 @@
     /**
     @brief
-        Returns a new SimpleInputState and configures it first.
-    */
-    SimpleInputState* InputManager::createSimpleInputState(const std::string &name, int priority)
-    {
-        SimpleInputState* state = new SimpleInputState();
-        if (_configureInputState(state, name, priority))
-            return state;
-        else
-        {
-            delete state;
-            return 0;
-        }
-    }
-
-    /**
-    @brief
-        Returns a new ExtendedInputState and configures it first.
-    */
-    ExtendedInputState* InputManager::createExtendedInputState(const std::string &name, int priority)
-    {
-        ExtendedInputState* state = new ExtendedInputState();
-        if (_configureInputState(state, name, priority))
-            return state;
-        else
-        {
-            delete state;
-            return 0;
-        }
-    }
-
-    /**
-    @brief
-        Returns a new InputState of type 'type' and configures it first.
-    @param type
-        String name of the class (used by the factory)
-    */
-    InputState* InputManager::createInputState(const std::string& type, const std::string &name, int priority)
-    {
-        InputState* state = dynamic_cast<InputState*>(Factory::getIdentifier(type)->fabricate());
-        if (_configureInputState(state, name, priority))
-            return state;
-        else
-        {
-            delete state;
-            return 0;
-        }
-    }
-
-    /**
-    @brief
         Removes an input state internally.
     @param name

code/branches/gui/src/core/input/InputManager.h

@@ -102 +102 @@
         void setWindowExtents(const int width, const int height);
 
-        SimpleInputState*   createSimpleInputState  (const std::string& name, int priority);
-        ExtendedInputState* createExtendedInputState(const std::string& name, int priority);
-        InputState*         createInputState(const std::string& type, const std::string &name, int priority);
+        template <class T>
+        T* createInputState(const std::string& name, int priority)
+        {
+            T* state = new T;
+            if (_configureInputState(state, name, priority))
+                return state;
+            else
+            {
+                delete state;
+                return 0;
+            }
+        }
+
         bool destroyState          (const std::string& name);
         InputState* getState       (const std::string& name);

code/branches/gui/src/core/input/InputState.h

@@ -40 +40 @@
 #include <vector>
 #include "core/Executor.h"
-#include "core/BaseObject.h"
-#include "core/CoreIncludes.h"
 #include "InputInterfaces.h"
 
 namespace orxonox
 {
-    class _CoreExport InputState : public BaseObject
+    class _CoreExport InputState
     {
         friend class InputManager;
@@ -89 +87 @@
 
     protected:
-        InputState() : priority_(0), executorOnEnter_(0), executorOnLeave_(0)
-        { RegisterObject(InputState); }
+        InputState() : priority_(0), executorOnEnter_(0), executorOnLeave_(0) { }
         virtual ~InputState() { }
 

code/branches/gui/src/core/input/KeyDetector.cc

@@ -68 +68 @@
     void KeyDetector::loadBindings(const std::string& command)
     {
+        this->command_ = command;
         clearBindings();
         setConfigValues();
-        this->command_ = command;
     }
 

code/branches/gui/src/core/input/SimpleInputState.cc

@@ -38 +38 @@
 #include "core/Debug.h"
 #include "core/Executor.h"
-#include "core/CoreIncludes.h"
 
 namespace orxonox
 {
-    CreateFactory(SimpleInputState);
-
     using namespace InputDevice;
 
@@ -51 +48 @@
         , joyStickHandlerAll_(0)
     {
-        RegisterObject(SimpleInputState);
     }
 

code/branches/gui/src/core/input/SimpleInputState.h

@@ -46 +46 @@
     {
         friend class InputManager;
-        friend class ClassFactory<SimpleInputState>;
 
     public:

code/branches/gui/src/orxonox/GraphicsEngine.cc

@@ -64 +64 @@
 namespace orxonox
 {
+    SetConsoleCommand(GraphicsEngine, printScreen, true).setKeybindMode(KeybindMode::OnPress);
+
     GraphicsEngine* GraphicsEngine::singletonRef_s = 0;
 
@@ -72 +74 @@
         The only instance of GraphicsEngine.
     */
-    /*static*/ GraphicsEngine& GraphicsEngine::getSingleton()
+    /*static*/ GraphicsEngine& GraphicsEngine::getInstance()
     {
         assert(singletonRef_s);
@@ -128 +130 @@
         if (this->root_)
             delete this->root_;
-        this->root_ = 0;
-        this->levelSceneManager_ = 0;
-        this->renderWindow_ = 0;
 
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
@@ -154 +153 @@
         CCOUT(3) << "Setting up..." << std::endl;
 
-        // TODO: LogManager doesn't work on linux platform. The why is yet unknown.
+        // TODO: LogManager doesn't work on oli platform. The why is yet unknown.
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
         // create a new logManager
@@ -193 +192 @@
         root_ = new Ogre::Root(ogrePluginsFile_, ogreConfigFile_, ogreLogFile_);
 
-        if (!root_->getInstalledPlugins().size())
-        {
-            ThrowException(PluginsNotFound, "No Ogre plugins declared. Cannot load Ogre.");
-        }
-
-#if 0 // Ogre 1.4.3 doesn't support setDebugOutputEnabled(.)
-//#if ORXONOX_PLATFORM != ORXONOX_PLATFORM_WIN32
+        // We don't need plugins for the dedicated..
+        //if (!root_->getInstalledPlugins().size() > 0)
+        //{
+        //    ThrowException(PluginsNotFound, "No Ogre plugins declared. Cannot load Ogre.");
+        //}
+
+#if 0 // Ogre 1.4.3 doesn't yet support setDebugOutputEnabled(.)
+#if ORXONOX_PLATFORM != ORXONOX_PLATFORM_WIN32
         // tame the ogre ouput so we don't get all the mess in the console
         Ogre::Log* defaultLog = Ogre::LogManager::getSingleton().getDefaultLog();
@@ -206 +206 @@
         defaultLog->addListener(this);
 #endif
+#endif
 
         CCOUT(4) << "Creating Ogre Root done" << std::endl;
@@ -233 +234 @@
             cf.load(Settings::getDataPath() + resourceFile_);
         }
-        catch (Ogre::Exception& ex)
-        {
-            COUT(1) << ex.getFullDescription() << std::endl;
+        catch (...)
+        {
+            //COUT(1) << ex.getFullDescription() << std::endl;
             COUT(0) << "Have you forgotten to set the data path in orxnox.ini?" << std::endl;
             throw;
@@ -300 +301 @@
     }
 
-    bool GraphicsEngine::initialiseResources()
+    void GraphicsEngine::initialiseResources()
     {
         CCOUT(4) << "Initialising resources" << std::endl;
@@ -313 +314 @@
             }*/
         }
-        catch (Ogre::Exception& e)
-        {
-            CCOUT(2) << "Error: There was an Error when initialising the resources." << std::endl;
-            CCOUT(2) << "ErrorMessage: " << e.getFullDescription() << std::endl;
-            return false;
-        }
-        return true;
+        catch (...)
+        {
+            CCOUT(2) << "Error: There was a serious error when initialising the resources." << std::endl;
+            throw;
+        }
     }
 
@@ -326 +325 @@
         Creates the SceneManager
     */
-    bool GraphicsEngine::createNewScene()
+    void GraphicsEngine::createNewScene()
     {
         CCOUT(4) << "Creating new SceneManager..." << std::endl;
@@ -332 +331 @@
         {
             CCOUT(2) << "SceneManager already exists! Skipping." << std::endl;
-            return false;
         }
         this->levelSceneManager_ = this->root_->createSceneManager(Ogre::ST_GENERIC, "LevelSceneManager");
-        CCOUT(3) << "Created SceneManager: " << levelSceneManager_ << std::endl;
-        return true;
+        CCOUT(3) << "Created SceneManager: " << levelSceneManager_->getName() << std::endl;
     }
 
@@ -487 +484 @@
     }
 
+
+    /*static*/ void GraphicsEngine::printScreen()
+    {
+        if (getInstance().renderWindow_)
+        {
+            getInstance().renderWindow_->writeContentsToTimestampedFile("shot_", ".jpg");
+        }
+    }
 }

code/branches/gui/src/orxonox/GraphicsEngine.h

@@ -62 +62 @@
         void declareRessourceLocations();
         void loadRenderer();
-        bool initialiseResources();
-        bool createNewScene();
+        void initialiseResources();
+        void createNewScene();
 
         void setLevelSceneManager(Ogre::SceneManager* sceneMgr) { this->levelSceneManager_ = sceneMgr; }
@@ -87 +87 @@
         { return this->detailLevelParticle_; }
 
-        static GraphicsEngine& getSingleton();
-        static GraphicsEngine* getSingletonPtr() { return singletonRef_s; }
+        // console commands
+        static void printScreen();
+
+        static GraphicsEngine& getInstance();
+        static GraphicsEngine* getInstancePtr() { return singletonRef_s; }
 
     private:

code/branches/gui/src/orxonox/Orxonox.cc

@@ -112 +112 @@
     , mode_(GameMode::GM_Unspecified)
     , debugRefreshTime_(0.0f)
-    , ogre_(0)
+    , graphicsEngine_(0)
     , inputManager_(0)
     , radar_(0)
@@ -157 +157 @@
       delete inputManager_;
 
-    if (this->ogre_)
-      delete ogre_;
+    if (this->graphicsEngine_)
+      delete graphicsEngine_;
 
     if (network::Client::getSingleton())
@@ -212 +212 @@
   }
 
-
-  /**
-   * Starts the whole Game.
-   * @param path path to config (in home dir or something)
-   */
-  void Orxonox::start()
-  {
-#ifdef _DEBUG
-    ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox_d.ini");
+    /**
+    @brief
+        Starts the whole Game.
+    @param path
+        path to config (in home dir or something)
+    */
+    void Orxonox::start()
+    {
+#if ORXONOX_DEBUG_MODE == 1
+        ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox_d.ini");
 #else
-    ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox.ini");
+        ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox.ini");
 #endif
-    Factory::createClassHierarchy();
-
-    setConfigValues();
-
-    const Settings::CommandLineArgument* mode = Settings::getCommandLineArgument("mode");
-    assert(mode);
-    if (!mode->bHasDefaultValue_)
+
+        // creates the class hierarchy for all classes with factories
+        Factory::createClassHierarchy();
+
+        setConfigValues();
+
+        const Settings::CommandLineArgument* mode = Settings::getCommandLineArgument("mode");
+        assert(mode);
+        if (!mode->bHasDefaultValue_)
+        {
+            Settings::setGameMode(mode->value_);
+            this->mode_ = Settings::getGameMode();
+        }
+        COUT(3) << "Orxonox: Game mode is " << mode_.name << "." << std::endl;
+
+        const Settings::CommandLineArgument* dataPath = Settings::getCommandLineArgument("dataPath");
+        assert(dataPath);
+        if (!dataPath->bHasDefaultValue_)
+        {
+            if (*dataPath->value_.getString().end() != '/' && *dataPath->value_.getString().end() != '\\')
+                Settings::tsetDataPath(dataPath->value_.getString() + "/");
+            else
+                Settings::tsetDataPath(dataPath->value_.getString());
+        }
+
+        try
+        {
+            // initialise TCL
+            TclBind::getInstance().setDataPath(Settings::getDataPath());
+
+            graphicsEngine_ = new GraphicsEngine();
+            graphicsEngine_->setup();       // creates ogre root and other essentials
+
+            if (mode_.showsGraphics)
+            {
+                graphicsEngine_->loadRenderer();    // creates the render window
+
+                // TODO: Spread this so that this call only initialises things needed for the Console and GUI
+                graphicsEngine_->initialiseResources();
+
+                // Calls the InputManager which sets up the input devices.
+                // The render window width and height are used to set up the mouse movement.
+                inputManager_ = new InputManager();
+                inputManager_->initialise(graphicsEngine_->getWindowHandle(),
+                    graphicsEngine_->getWindowWidth(), graphicsEngine_->getWindowHeight(), true, true, true);
+                KeyBinder* keyBinder = new KeyBinder();
+                keyBinder->loadBindings();
+                inputManager_->createInputState<SimpleInputState>("game", 20)->setHandler(keyBinder);
+
+                // Load the InGameConsole
+                console_ = new InGameConsole();
+                console_->initialise();
+
+                // load the CEGUI interface
+                guiManager_ = new GUIManager();
+                guiManager_->initialise();
+            }
+            else
+            {
+                // TODO: Initialise a not yet written console that operates in the shell we
+                // started the game from.
+                // We probably want to use std::cin to catch input (OIS uses DirectX or X server)
+            }
+
+            bool showGUI = true;
+            if (mode_.mode != GameMode::Unspecified)
+            {
+                showGUI = false;
+                // a game mode was specified with the command line
+                // we therefore load the game and level directly
+
+                if (!loadLevel(this->mode_))
+                {
+                    COUT(1) << "Loading with predefined mode failed. Showing main menu." << std::endl;
+                    showGUI = true;
+                    mode_ = GameMode::GM_Unspecified;
+                }
+            }
+
+            if (showGUI)
+            {
+                // show main menu
+                GUIManager::getInstance().showGUI("MainMenu", 0);
+                GraphicsEngine::getInstance().getViewport()->setCamera(GUIManager::getInstance().getCamera());
+            }
+        }
+        catch (std::exception& ex)
+        {
+            COUT(1) << ex.what() << std::endl;
+            COUT(1) << "Loading sequence aborted." << std::endl;
+            return;
+        }
+
+        modeRequest_ = mode_;
+        // here happens the game
+        startRenderLoop();
+
+        if (mode_.mode == GameMode::Client)
+            network::Client::getSingleton()->closeConnection();
+
+        if (mode_.hasServer)
+            server_g->close();
+    }
+
+    /*static*/ void Orxonox::loadGame(const std::string& name)
     {
-      Settings::setGameMode(mode->value_);
-      this->mode_ = Settings::getGameMode();
+        const GameMode& mode = Settings::getGameMode(name);
+        if (mode.mode == GameMode::None)
+            return;
+
+        getSingleton().modeRequest_ = mode;
     }
-    COUT(3) << "Orxonox: Game mode is " << mode_.name << "." << std::endl;
-
-    const Settings::CommandLineArgument* dataPath = Settings::getCommandLineArgument("dataPath");
-    assert(dataPath);
-    if (!dataPath->bHasDefaultValue_)
+
+    bool Orxonox::loadLevel(const GameMode& mode)
     {
-      if (*dataPath->value_.getString().end() != '/' && *dataPath->value_.getString().end() != '\\')
-        Settings::tsetDataPath(dataPath->value_.getString() + "/");
-      else
-        Settings::tsetDataPath(dataPath->value_.getString());
+        bool success = true;
+
+        if (mode.showsGraphics)
+        {
+            // create Ogre SceneManager for the level
+            graphicsEngine_->createNewScene();
+
+            if (!loadPlayground())
+                return false;
+        }
+
+        switch (mode.mode)
+        {
+        case GameMode::Server:
+            success &= serverLoad();
+            break;
+        case GameMode::Client:
+            success &= clientLoad();
+            break;
+        case GameMode::Dedicated:
+            success &= serverLoad();
+            break;
+        case GameMode::Standalone:
+            success &= standaloneLoad();
+            break;
+        default: // never happens
+            assert(false);
+        }
+
+        if (success)
+        {
+            InputManager::getInstance().requestEnterState("game");
+            this->mode_ = mode;
+        }
+
+        return success;
     }
-
-    try
-    {
-        // initialise TCL
-        TclBind::getInstance().setDataPath(Settings::getDataPath());
-
-        ogre_ = new GraphicsEngine();
-        ogre_->setup();       // creates ogre root and other essentials
-
-        if (mode_.showsGraphics)
-        {
-          ogre_->loadRenderer();    // creates the render window
-
-          // TODO: Spread this so that this call only initialises things needed for the Console and GUI
-          ogre_->initialiseResources();
-
-          // Calls the InputManager which sets up the input devices.
-          // The render window width and height are used to set up the mouse movement.
-          inputManager_ = new InputManager();
-          inputManager_->initialise(ogre_->getWindowHandle(),
-                ogre_->getWindowWidth(), ogre_->getWindowHeight(), true, true, true);
-          KeyBinder* keyBinder = new KeyBinder();
-          keyBinder->loadBindings();
-          inputManager_->createSimpleInputState("game", 20)->setHandler(keyBinder);
-
-          // Load the InGameConsole
-          console_ = new InGameConsole();
-          console_->initialise();
-
-          // load the CEGUI interface
-          guiManager_ = new GUIManager();
-          guiManager_->initialise();
-        }
-
-        bool showGUI = true;
-        if (mode_.mode != GameMode::Unspecified)
-        {
-          showGUI = false;
-          // a game mode was specified with the command line
-          // we therefore load the game and level directly
-
-          if (!loadLevel(this->mode_))
-          {
-            COUT(1) << "Loading with predefined mode failed. Showing main menu." << std::endl;
-            showGUI = true;
-            mode_ = GameMode::GM_Unspecified;
-          }
-        }
-        
-        if (showGUI)
-        {
-          // show main menu
-          GUIManager::getInstance().showGUI("MainMenu", 0);
-          GraphicsEngine::getSingleton().getViewport()->setCamera(GUIManager::getInstance().getCamera());
-        }
-    }
-    catch (std::exception& ex)
-    {
-      COUT(1) << ex.what() << std::endl;
-      COUT(1) << "Loading sequence aborted." << std::endl;
-      return;
-    }
-
-    modeRequest_ = mode_;
-    // here happens the game
-    startRenderLoop();
-
-    if (mode_.mode == GameMode::Client)
-      network::Client::getSingleton()->closeConnection();
-
-    if (mode_.hasServer)
-      server_g->close();
-  }
-
-  /*static*/ void Orxonox::loadGame(const std::string& name)
-  {
-      const GameMode& mode = Settings::getGameMode(name);
-      if (mode.mode == GameMode::None)
-          return;
-
-      getSingleton().modeRequest_ = mode;
-  }
-
-  bool Orxonox::loadLevel(const GameMode& mode)
-  {
-      bool success = true;
-
-      if (mode.showsGraphics)
-      {
-        // create Ogre SceneManager for the level
-        ogre_->createNewScene();
-
-        if (!loadPlayground())
-            return false;
-      }
-
-      switch (mode.mode)
-      {
-      case GameMode::Server:
-        success &= serverLoad();
-        break;
-      case GameMode::Client:
-        success &= clientLoad();
-        break;
-      case GameMode::Dedicated:
-        success &= serverLoad();
-        break;
-      case GameMode::Standalone:
-        success &= standaloneLoad();
-        break;
-      default: // never happens
-          assert(false);
-      }
-      
-      if (success)
-      {
-        InputManager::getInstance().requestEnterState("game");
-        this->mode_ = mode;
-      }
-
-      return success;
-  }
 
   /**
@@ -528 +537 @@
         if (timeAfterTick > refreshStartTime + refreshTime)
         {
-          GraphicsEngine::getSingleton().setAverageTickTime(
+          GraphicsEngine::getInstance().setAverageTickTime(
               (float)tickTime * 0.001 / (frameCount - oldFrameCount));
           float avgFPS = (float)(frameCount - oldFrameCount) / (timeAfterTick - refreshStartTime) * 1000000.0;
-          GraphicsEngine::getSingleton().setAverageFramesPerSecond(avgFPS);
+          GraphicsEngine::getInstance().setAverageFramesPerSecond(avgFPS);
 
           oldFrameCount = frameCount;
@@ -552 +561 @@
           // make sure the window stays active even when not focused
           // (probably only necessary on windows)
-          GraphicsEngine::getSingleton().setWindowActivity(true);
+          GraphicsEngine::getInstance().setWindowActivity(true);
 
           // tick CEGUI

code/branches/gui/src/orxonox/Orxonox.h

@@ -84 +84 @@
 
     private:
-      Level*                startLevel_;    //!< current hard coded default level
-      Level*                hud_;           //!< 'level' object fo the HUD
-      //audio::AudioManager*  auMan_;         //!< audio manager
-      Ogre::Timer*          timer_;         //!< Main loop timer
-      bool                  bAbort_;        //!< aborts the render loop if true
-      float                 timefactor_;    //!< A factor to change the gamespeed
+      Level*                startLevel_;       //!< current hard coded default level
+      Level*                hud_;              //!< 'level' object fo the HUD
+      //audio::AudioManager*  auMan_;            //!< audio manager
+      Ogre::Timer*          timer_;            //!< Main loop timer
+      bool                  bAbort_;           //!< aborts the render loop if true
+      float                 timefactor_;       //!< A factor to change the gamespeed
 
       // this is used to identify the mode (server/client/...) we're in
@@ -99 +99 @@
 
       // By Orxonox managed singleton pointers
-      GraphicsEngine*       ogre_;          //!< our dearest graphics engine <3
+      GraphicsEngine*       graphicsEngine_;   //!< our dearest graphics engine <3
       InputManager*         inputManager_;
-      Radar*                radar_;         //!< represents the Radar (not the HUD part)
+      Radar*                radar_;            //!< represents the Radar (not the HUD part)
       InGameConsole*        console_;
       GUIManager*           guiManager_;

code/branches/gui/src/orxonox/OrxonoxPrereqs.h

@@ -84 +84 @@
     class Backlight;
     class Camera;
-    class Fighter;
     class Model;
     class NPC;
@@ -131 +130 @@
 }
 
+namespace CEGUI
+{
+    class LuaScriptModule;
+
+    class OgreCEGUIRenderer;
+    class OgreCEGUIResourceProvider;
+    class OgreCEGUITexture;
+}
+
+struct lua_State;
+
 #endif /* _OrxonoxPrereqs_H__ */

code/branches/gui/src/orxonox/gui/GUIManager.cc

@@ -29 +29 @@
 /**
     @file
-    @brief Implementation of the GUIManager class.
+    @brief
+        Implementation of the GUIManager class.
 */
 
@@ -120 +121 @@
             {
                 // get the render window
-                renderWindow_ = GraphicsEngine::getSingleton().getRenderWindow();
+                renderWindow_ = GraphicsEngine::getInstance().getRenderWindow();
 
                 // Full screen viewport with Z order = 0 (top most). Don't yet feed a camera (so nothing gets rendered)
@@ -150 +151 @@
 
                 // register us as input handler
-                SimpleInputState* state = InputManager::getInstance().createSimpleInputState("gui", 30);
+                SimpleInputState* state = InputManager::getInstance().createInputState<SimpleInputState>("gui", 30);
                 state->setHandler(this);
                 state->setJoyStickHandler(new EmptyHandler());
@@ -159 +160 @@
             catch (CEGUI::Exception& ex)
             {
-#if CEGUI_VERSION_MINOR < 6
+#if CEGUI_VERSION_MAJOR == 0 && CEGUI_VERSION_MINOR < 6
                 throw GeneralException(ex.getMessage().c_str());
 #else

code/branches/gui/src/orxonox/gui/GUIManager.h

@@ -41 +41 @@
 #include <CEGUISystem.h>
 #include "core/input/InputInterfaces.h"
-
-// forward declarations
-namespace CEGUI
-{
-    class OgreCEGUIRenderer;
-    class LuaScriptModule;
-}
-struct lua_State;
 
 namespace orxonox // tolua_export

code/branches/gui/src/orxonox/objects/Ambient.cc

@@ -65 +65 @@
 
     bool Ambient::create(){
-      GraphicsEngine::getSingleton().getLevelSceneManager()->setAmbientLight(ambientLight_);
+      GraphicsEngine::getInstance().getLevelSceneManager()->setAmbientLight(ambientLight_);
       return Synchronisable::create();
     }
@@ -76 +76 @@
     void Ambient::setAmbientLight(const ColourValue& colour)
     {
-        GraphicsEngine::getSingleton().getLevelSceneManager()->setAmbientLight(colour);
+        GraphicsEngine::getInstance().getLevelSceneManager()->setAmbientLight(colour);
       ambientLight_=colour;     
     }

code/branches/gui/src/orxonox/objects/Backlight.cc

@@ -58 +58 @@
         this->attachObject(this->billboard_.getBillboardSet());
 
-        this->ribbonTrail_ = GraphicsEngine::getSingleton().getLevelSceneManager()->createRibbonTrail(this->getName() + "RibbonTrail");
-        this->ribbonTrailNode_ = GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName() + "RibbonTrailNode");
+        this->ribbonTrail_ = GraphicsEngine::getInstance().getLevelSceneManager()->createRibbonTrail(this->getName() + "RibbonTrail");
+        this->ribbonTrailNode_ = GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName() + "RibbonTrailNode");
         this->ribbonTrailNode_->attachObject(this->ribbonTrail_);
         this->ribbonTrail_->addNode(this->getNode());
@@ -76 +76 @@
         {
             this->detachObject(this->billboard_.getBillboardSet());
-            GraphicsEngine::getSingleton().getLevelSceneManager()->destroySceneNode(this->getName() + "RibbonTrailNode");
-            GraphicsEngine::getSingleton().getLevelSceneManager()->destroyRibbonTrail(this->ribbonTrail_);
+            GraphicsEngine::getInstance().getLevelSceneManager()->destroySceneNode(this->getName() + "RibbonTrailNode");
+            GraphicsEngine::getInstance().getLevelSceneManager()->destroyRibbonTrail(this->ribbonTrail_);
         }
     }

code/branches/gui/src/orxonox/objects/Camera.cc

@@ -52 +52 @@
   {
     this->bHasFocus_ = false;
-    this->cameraNode_ = GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode(node->getName() + "Camera");
+    this->cameraNode_ = GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode(node->getName() + "Camera");
     if( node != NULL )
       this->setPositionNode(node);
@@ -60 +60 @@
   {
     CameraHandler::getInstance()->releaseFocus(this);
-    GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->removeAndDestroyChild(cameraNode_->getName());
+    GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->removeAndDestroyChild(cameraNode_->getName());
   }
 

code/branches/gui/src/orxonox/objects/CameraHandler.cc

@@ -44 +44 @@
   CameraHandler::CameraHandler()
   {
-    this->cam_ = GraphicsEngine::getSingleton().getLevelSceneManager()->createCamera("Cam");
-    GraphicsEngine::getSingleton().getViewport()->setCamera(this->cam_);
-    //GraphicsEngine::getSingleton().getRenderWindow()->addViewport(this->cam_, 2, 0.4, 0.4, 0.2, 0.2);
+    this->cam_ = GraphicsEngine::getInstance().getLevelSceneManager()->createCamera("Cam");
+    GraphicsEngine::getInstance().getViewport()->setCamera(this->cam_);
+    //GraphicsEngine::getInstance().getRenderWindow()->addViewport(this->cam_, 2, 0.4, 0.4, 0.2, 0.2);
     /*this->activeCamera_ = *ObjectList<Camera>::begin();
     this->activeCamera_->cam_ = this->cam_;*/

code/branches/gui/src/orxonox/objects/ParticleSpawner.cc

@@ -79 +79 @@
         this->setPosition(this->getNode()->getParent()->getPosition());
         this->getNode()->getParent()->removeChild(this->getNode());
-        GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->addChild(this->getNode());
+        GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->addChild(this->getNode());
         if (this->particle_)
             this->particle_->setEnabled(false);

code/branches/gui/src/orxonox/objects/Skybox.cc

@@ -56 +56 @@
     void Skybox::setSkybox(const std::string& skyboxname)
     {
-        GraphicsEngine::getSingleton().getLevelSceneManager()->setSkyBox(true, skyboxname);
+        GraphicsEngine::getInstance().getLevelSceneManager()->setSkyBox(true, skyboxname);
     }
 
@@ -92 +92 @@
     {
         BaseObject::changedVisibility();
-        GraphicsEngine::getSingleton().getLevelSceneManager()->setSkyBox(this->isVisible(), this->skyboxSrc_);
+        GraphicsEngine::getInstance().getLevelSceneManager()->setSkyBox(this->isVisible(), this->skyboxSrc_);
     }
 }

code/branches/gui/src/orxonox/objects/WorldEntity.cc

@@ -49 +49 @@
         RegisterObject(WorldEntity);
 
-        if (GraphicsEngine::getSingleton().getLevelSceneManager())
+        if (GraphicsEngine::getInstance().getLevelSceneManager())
         {
             std::ostringstream name;
             name << (WorldEntity::worldEntityCounter_s++);
             this->setName("WorldEntity" + name.str());
-            this->node_ = GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
+            this->node_ = GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
 
             registerAllVariables();
@@ -77 +77 @@
         {
             this->getNode()->removeAndDestroyAllChildren();
-            GraphicsEngine::getSingleton().getLevelSceneManager()->destroySceneNode(this->getName());
+            GraphicsEngine::getInstance().getLevelSceneManager()->destroySceneNode(this->getName());
         }
     }
@@ -178 +178 @@
     void WorldEntity::attachObject(const WorldEntity& obj) const
     {
-        GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->removeChild(obj.getNode());
+        GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->removeChild(obj.getNode());
         this->getNode()->addChild(obj.getNode());
     }
@@ -184 +184 @@
     void WorldEntity::attachObject(WorldEntity* obj) const
     {
-        GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->removeChild(obj->getNode());
+        GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->removeChild(obj->getNode());
         this->getNode()->addChild(obj->getNode());
     }

code/branches/gui/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -115 +115 @@
             // We'll have to get the aspect ratio manually for the first time. Afterwards windowResized() gets
             // called automatically by the GraphicsEngine.
-            this->windowResized(GraphicsEngine::getSingleton().getWindowWidth(),
-                GraphicsEngine::getSingleton().getWindowHeight());
+            this->windowResized(GraphicsEngine::getInstance().getWindowWidth(),
+                GraphicsEngine::getInstance().getWindowHeight());
 
             this->changedVisibility();

code/branches/gui/src/orxonox/overlays/console/InGameConsole.cc

@@ -147 +147 @@
     {
         // create the corresponding input state
-        InputManager::getInstance().createSimpleInputState("console", 40)
+        InputManager::getInstance().createInputState<SimpleInputState>("console", 40)
             ->setKeyHandler(Shell::getInstance().getInputBuffer());
 
@@ -219 +219 @@
         this->consoleOverlayContainer_->addChild(this->consoleOverlayNoise_);
 
-        this->windowResized(GraphicsEngine::getSingleton().getWindowWidth(), GraphicsEngine::getSingleton().getWindowHeight());
+        this->windowResized(GraphicsEngine::getInstance().getWindowWidth(), GraphicsEngine::getInstance().getWindowHeight());
 
         // move overlay "above" the top edge of the screen

code/branches/gui/src/orxonox/overlays/debug/DebugFPSText.cc

@@ -49 +49 @@
     void DebugFPSText::tick(float dt)
     {
-        float fps = GraphicsEngine::getSingleton().getAverageFramesPerSecond();
+        float fps = GraphicsEngine::getInstance().getAverageFramesPerSecond();
         this->text_->setCaption(this->getCaption() + convertToString(fps));
     }

code/branches/gui/src/orxonox/overlays/debug/DebugRTRText.cc

@@ -49 +49 @@
     void DebugRTRText::tick(float dt)
     {
-        float rtr = GraphicsEngine::getSingleton().getAverageTickTime();
+        float rtr = GraphicsEngine::getInstance().getAverageTickTime();
         this->text_->setCaption(this->getCaption() + convertToString(rtr));
     }

code/branches/gui/src/orxonox/tools/BillboardSet.cc

@@ -50 +50 @@
         std::ostringstream name;
         name << (BillboardSet::billboardSetCounter_s++);
-        this->billboardSet_ = GraphicsEngine::getSingleton().getLevelSceneManager()->createBillboardSet("Billboard" + name.str(), count);
+        this->billboardSet_ = GraphicsEngine::getInstance().getLevelSceneManager()->createBillboardSet("Billboard" + name.str(), count);
         this->billboardSet_->createBillboard(Vector3::ZERO);
         this->billboardSet_->setMaterialName(file);
@@ -59 +59 @@
         std::ostringstream name;
         name << (BillboardSet::billboardSetCounter_s++);
-        this->billboardSet_ = GraphicsEngine::getSingleton().getLevelSceneManager()->createBillboardSet("Billboard" + name.str(), count);
+        this->billboardSet_ = GraphicsEngine::getInstance().getLevelSceneManager()->createBillboardSet("Billboard" + name.str(), count);
         this->billboardSet_->createBillboard(Vector3::ZERO, colour);
         this->billboardSet_->setMaterialName(file);
@@ -68 +68 @@
         std::ostringstream name;
         name << (BillboardSet::billboardSetCounter_s++);
-        this->billboardSet_ = GraphicsEngine::getSingleton().getLevelSceneManager()->createBillboardSet("Billboard" + name.str(), count);
+        this->billboardSet_ = GraphicsEngine::getInstance().getLevelSceneManager()->createBillboardSet("Billboard" + name.str(), count);
         this->billboardSet_->createBillboard(position);
         this->billboardSet_->setMaterialName(file);
@@ -77 +77 @@
         std::ostringstream name;
         name << (BillboardSet::billboardSetCounter_s++);
-        this->billboardSet_ = GraphicsEngine::getSingleton().getLevelSceneManager()->createBillboardSet("Billboard" + name.str(), count);
+        this->billboardSet_ = GraphicsEngine::getInstance().getLevelSceneManager()->createBillboardSet("Billboard" + name.str(), count);
         this->billboardSet_->createBillboard(position, colour);
         this->billboardSet_->setMaterialName(file);
@@ -85 +85 @@
     {
         if (this->billboardSet_)
-            GraphicsEngine::getSingleton().getLevelSceneManager()->destroyBillboardSet(this->billboardSet_);
+            GraphicsEngine::getInstance().getLevelSceneManager()->destroyBillboardSet(this->billboardSet_);
     }
 }

code/branches/gui/src/orxonox/tools/Light.cc

@@ -49 +49 @@
         std::ostringstream name;
         name << (Light::lightCounter_s++);
-        this->light_ = GraphicsEngine::getSingleton().getLevelSceneManager()->createLight("Light" + name.str());
+        this->light_ = GraphicsEngine::getInstance().getLevelSceneManager()->createLight("Light" + name.str());
         this->light_->setType(type);
         this->light_->setDiffuseColour(diffuse);
@@ -58 +58 @@
     {
         if (this->light_)
-            GraphicsEngine::getSingleton().getLevelSceneManager()->destroyLight(this->light_);
+            GraphicsEngine::getInstance().getLevelSceneManager()->destroyLight(this->light_);
     }
 }

code/branches/gui/src/orxonox/tools/Mesh.cc

@@ -49 +49 @@
         std::ostringstream name;
         name << (Mesh::meshCounter_s++);
-        this->entity_ = GraphicsEngine::getSingleton().getLevelSceneManager()->createEntity("Mesh" + name.str(), file);
+        this->entity_ = GraphicsEngine::getInstance().getLevelSceneManager()->createEntity("Mesh" + name.str(), file);
     }
 
@@ -55 +55 @@
     {
         if (this->entity_)
-            GraphicsEngine::getSingleton().getLevelSceneManager()->destroyEntity(this->entity_);
+            GraphicsEngine::getInstance().getLevelSceneManager()->destroyEntity(this->entity_);
     }
 }

code/branches/gui/src/orxonox/tools/ParticleInterface.cc

@@ -55 +55 @@
     this->bEnabled_ = true;
     this->detaillevel_ = (unsigned int)detaillevel;
-    this->particleSystem_ = GraphicsEngine::getSingleton().getLevelSceneManager()->createParticleSystem("particles" + getConvertedValue<unsigned int, std::string>(ParticleInterface::counter_s++), templateName);
+    this->particleSystem_ = GraphicsEngine::getInstance().getLevelSceneManager()->createParticleSystem("particles" + getConvertedValue<unsigned int, std::string>(ParticleInterface::counter_s++), templateName);
     this->particleSystem_->setSpeedFactor(Orxonox::getSingleton().getTimeFactor());
 
-    if (GraphicsEngine::getSingleton().getDetailLevelParticle() < (unsigned int)this->detaillevel_)
+    if (GraphicsEngine::getInstance().getDetailLevelParticle() < (unsigned int)this->detaillevel_)
     {
       this->bVisible_ = false;
@@ -72 +72 @@
   {
     this->particleSystem_->removeAllEmitters();
-    GraphicsEngine::getSingleton().getLevelSceneManager()->destroyParticleSystem(particleSystem_);
+    GraphicsEngine::getInstance().getLevelSceneManager()->destroyParticleSystem(particleSystem_);
   }