Changeset 1642 for code/branches/gui

Timestamp:

Jul 23, 2008, 3:37:29 PM (16 years ago)

Author:

rgrieder

Message:

• changed the static interface of the InputManager to a member one with getInstance()
• converted InputManager and InGameConsole to Ogre Singletons (c'tor and d'tor public, but assert in c'tor to prevent multiple instances at runtime)
• added toluabind_orxonox files to tolua folder that contains a pimped version of tolua (I'll write a little cmake project soon to automate it; Currently that only works with msvc)
• commented out Loader::unload() from Orxonox destructor because that deleted the ParticleSpawners, which were using a method of a sceneNode that belonged to a already destroyed SpaceShip. —> Results in a memory leak. Previously Loader::unload() was called for all BaseObjects (now calling unload(level_)). And since 'P' from ParticleSpawner comes before 'S' like SpaceShip, the order was correct.
• Added factory feature for InputStates (can now be created by string if there is Factory entry for it)
• Created factory entries for SimpleInputState and ExtendedInputState

Location:

code/branches/gui

Files:

• src/core/Core.cc (modified) (1 diff)
• src/core/Exception.h (modified) (2 diffs)
• src/core/input/ExtendedInputState.cc (modified) (1 diff)
• src/core/input/ExtendedInputState.h (modified) (1 diff)
• src/core/input/InputManager.cc (modified) (15 diffs)
• src/core/input/InputManager.h (modified) (5 diffs)
• src/core/input/InputState.h (modified) (1 diff)
• src/core/input/SimpleInputState.cc (modified) (2 diffs)
• src/core/input/SimpleInputState.h (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/Orxonox.cc (modified) (7 diffs)
• src/orxonox/Orxonox.h (modified) (2 diffs)
• src/orxonox/gui/GUIManager.cc (modified) (3 diffs)
• src/orxonox/overlays/console/InGameConsole.cc (modified) (6 diffs)
• src/orxonox/overlays/console/InGameConsole.h (modified) (4 diffs)
• src/tolua/CMakeLists.txt (modified) (1 diff)
• src/tolua/tolua.pkg (added)
• src/tolua/toluabind_orxonox.cc (added)
• src/tolua/toluabind_orxonox.h (added)
• visual_studio/base_properties.vsprops (modified) (1 diff)
• visual_studio/core_properties.vsprops (modified) (1 diff)
• visual_studio/network_properties.vsprops (modified) (1 diff)
• visual_studio/orxonox_properties.vsprops (modified) (1 diff)

code/branches/gui/src/core/Core.cc

@@ -196 +196 @@
     {
         TclThreadManager::getInstance().tick(dt);
-        InputManager::tick(dt);
+        InputManager::getInstance().tick(dt);
     }
 }

code/branches/gui/src/core/Exception.h

@@ -40 +40 @@
 #include <string>
 #include <exception>
+#include <cassert>
 #include "core/Debug.h"
 
@@ -129 +130 @@
     throw SpecificException<Exception::type>(description, __LINE__, __FILE__, __FUNCTIONNAME__)
 
+    // define an assert macro that can display a message
+#ifndef NDEBUG
+#define OrxAssert(condition, errorMessage) \
+    condition ? ((void)0) : (orxonox::OutputHandler::getOutStream().setOutputLevel(ORX_ERROR) << errorMessage << std::endl); \
+    assert(condition);
+#else
+#define OrxAssert(condition, errorMessage)  ((void)0)
+#endif
+
 }
 

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 @@
     {
     public:
-        ExtendedInputState() { }
+        ExtendedInputState();
         ~ExtendedInputState() { }
 

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

@@ -62 +62 @@
     SetConsoleCommandShortcut(InputManager, calibrate);
 
+    std::string InputManager::bindingCommmandString_s = "";
+    InputManager* InputManager::singletonRef_s = 0;
+
     using namespace InputDevice;
 
-    // ###############################
-    // ###    Internal Methods     ###
-    // ###############################
-    // ###############################
+    // ############################################################
+    // #####                  Initialisation                  #####
+    // ##########                                        ##########
+    // ############################################################
 
     /**
@@ -87 +90 @@
     {
         RegisterRootObject(InputManager);
-    }
-
-    /**
-    @brief
-        Destructor itself only called at the end of the program, after main.
-        Instance gets registered for destruction with atexit(.).
-    */
-    InputManager::~InputManager()
-    {
-        _destroy();
-    }
-
-    /**
-    @brief
-        The one instance of the InputManager is stored in this function.
-        Only for internal use. Public Interface ist static.
-    @return
-        A reference to the only instance of the InputManager
-    */
-    InputManager& InputManager::_getInstance()
-    {
-        static InputManager theOnlyInstance;
-        return theOnlyInstance;
-    }
-
-
-    // ############################################################
-    // #####                  Initialisation                  #####
-    // ##########                                        ##########
-    // ############################################################
+
+        assert(singletonRef_s == 0);
+        singletonRef_s = this;
+    }
 
     /**
@@ -129 +106 @@
         The height of the render window
     */
-    bool InputManager::_initialise(const size_t windowHnd, int windowWidth, int windowHeight,
+    bool InputManager::initialise(const size_t windowHnd, int windowWidth, int windowHeight,
                                    bool createKeyboard, bool createMouse, bool createJoySticks)
     {
@@ -431 +408 @@
     /**
     @brief
-        Destroys all the created input devices. InputManager will be ready for a
-        new initialisation.
-    */
-    void InputManager::_destroy()
+        Destroys all the created input devices and states.
+    */
+    InputManager::~InputManager()
     {
         if (inputSystem_)
@@ -550 +526 @@
         Delta time
     */
-    void InputManager::_tick(float dt)
+    void InputManager::tick(float dt)
     {
         if (inputSystem_ == 0)
@@ -983 +959 @@
 
     // ############################################################
-    // #####            Static Interface Methods              #####
+    // #####         Other Public Interface Methods           #####
     // ##########                                        ##########
     // ############################################################
-
-    std::string InputManager::bindingCommmandString_s = "";
-
-    bool InputManager::initialise(const size_t windowHnd, int windowWidth, int windowHeight,
-        bool createKeyboard, bool createMouse, bool createJoySticks)
-    {
-        return _getInstance()._initialise(windowHnd, windowWidth, windowHeight,
-            createKeyboard, createMouse, createJoySticks);
-    }
-
-    int InputManager::numberOfKeyboards()
-    {
-        if (_getInstance().keyboard_ != 0)
-            return 1;
-        else
-            return 0;
-    }
-
-    int InputManager::numberOfMice()
-    {
-        if (_getInstance().mouse_ != 0)
-            return 1;
-        else
-            return 0;
-    }
-
-    int InputManager::numberOfJoySticks()
-    {
-        return _getInstance().joySticksSize_;
-    }
-
-    /*bool InputManager::isKeyDown(KeyCode::Enum key)
-    {
-    if (_getInstance().keyboard_)
-        return _getInstance().keyboard_->isKeyDown((OIS::KeyCode)key);
-    else
-        return false;
-    }*/
-
-    /*bool InputManager::isModifierDown(KeyboardModifier::Enum modifier)
-    {
-    if (_getInstance().keyboard_)
-        return isModifierDown(modifier);
-    else
-        return false;
-    }*/
-
-    /*const MouseState InputManager::getMouseState()
-    {
-    if (_getInstance().mouse_)
-        return _getInstance().mouse_->getMouseState();
-    else
-        return MouseState();
-    }*/
-
-    /*const JoyStickState InputManager::getJoyStickState(unsigned int ID)
-    {
-    if (ID < _getInstance().joySticksSize_)
-        return JoyStickState(_getInstance().joySticks_[ID]->getJoyStickState(), ID);
-    else
-        return JoyStickState();
-    }*/
-
-    void InputManager::destroy()
-    {
-        _getInstance()._destroy();
-    }
-
 
     /**
@@ -1066 +974 @@
     void InputManager::setWindowExtents(const int width, const int height)
     {
-        if (_getInstance().mouse_)
+        if (mouse_)
         {
             // Set mouse region (if window resizes, we should alter this to reflect as well)
-            const OIS::MouseState &mouseState = _getInstance().mouse_->getMouseState();
-            mouseState.width  = width;
-            mouseState.height = height;
-        }
-    }
-
-    /**
-    @brief
-        Method for easily storing a string with the command executor. It is used by the
-        KeyDetector to get assign commands. The KeyDetector simply executes
-        the command 'storeKeyStroke myName' for each button/axis.
-    @remarks
-        This is only a temporary hack until we thourouhgly support multiple KeyBinders.
-    @param name
-        The name of the button/axis.
-    */
-    void InputManager::storeKeyStroke(const std::string& name)
-    {
-        requestLeaveState("detector");
-        COUT(0) << "Binding string \"" << bindingCommmandString_s << "\" on key '" << name << "'" << std::endl;
-        CommandExecutor::execute("config KeyBinder " + name + " " + bindingCommmandString_s, false);
-    }
-
-    /**
-    @brief
-        Assigns a command string to a key/button/axis. The name is determined via KeyDetector
-        and InputManager::storeKeyStroke(.).
-    @param command
-        Command string that can be executed by the CommandExecutor
-    */
-    void InputManager::keyBind(const std::string& command)
-    {
-        bindingCommmandString_s = command;
-        requestEnterState("detector");
-        COUT(0) << "Press any button/key or move a mouse/joystick axis" << std::endl;
-    }
-
-    /**
-    @brief
-        Starts joy stick calibration.
-    */
-    void InputManager::calibrate()
-    {
-        _getInstance().bCalibrating_ = true;
-        requestEnterState("calibrator");
-    }
-
-    void InputManager::tick(float dt)
-    {
-        _getInstance()._tick(dt);
-    }
+            mouse_->getMouseState().width  = width;
+            mouse_->getMouseState().height = height;
+        }
+    }
+
 
     // ###### InputStates ######
@@ -1139 +1001 @@
         if (name == "")
             return false;
-        if (_getInstance().inputStatesByName_.find(name) == _getInstance().inputStatesByName_.end())
-        {
-            if (_getInstance().inputStatesByPriority_.find(priority)
-                == _getInstance().inputStatesByPriority_.end())
-            {
-                _getInstance().inputStatesByName_[name] = state;
-                _getInstance().inputStatesByPriority_[priority] = state;
+        if (!state)
+            return false;
+        if (inputStatesByName_.find(name) == inputStatesByName_.end())
+        {
+            if (inputStatesByPriority_.find(priority)
+                == inputStatesByPriority_.end())
+            {
+                inputStatesByName_[name] = state;
+                inputStatesByPriority_[priority] = state;
                 state->setNumOfJoySticks(numberOfJoySticks());
                 state->setName(name);
@@ -1172 +1036 @@
     {
         SimpleInputState* state = new SimpleInputState();
-        if (_getInstance()._configureInputState(state, name, priority))
+        if (_configureInputState(state, name, priority))
             return state;
         else
@@ -1188 +1052 @@
     {
         ExtendedInputState* state = new ExtendedInputState();
-        if (_getInstance()._configureInputState(state, name, priority))
+        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
@@ -1214 +1096 @@
             return false;
         }
-        std::map<std::string, InputState*>::iterator it = _getInstance().inputStatesByName_.find(name);
-        if (it != _getInstance().inputStatesByName_.end())
-        {
-            _getInstance()._destroyState((*it).second);
+        std::map<std::string, InputState*>::iterator it = inputStatesByName_.find(name);
+        if (it != inputStatesByName_.end())
+        {
+            _destroyState((*it).second);
             return true;
         }
@@ -1233 +1115 @@
     InputState* InputManager::getState(const std::string& name)
     {
-        std::map<std::string, InputState*>::iterator it = _getInstance().inputStatesByName_.find(name);
-        if (it != _getInstance().inputStatesByName_.end())
+        std::map<std::string, InputState*>::iterator it = inputStatesByName_.find(name);
+        if (it != inputStatesByName_.end())
             return (*it).second;
         else
@@ -1248 +1130 @@
     InputState* InputManager::getCurrentState()
     {
-        return (*_getInstance().activeStates_.rbegin()).second;
+        return (*activeStates_.rbegin()).second;
     }
 
@@ -1263 +1145 @@
     {
         // get pointer from the map with all stored handlers
-        std::map<std::string, InputState*>::const_iterator it = _getInstance().inputStatesByName_.find(name);
-        if (it != _getInstance().inputStatesByName_.end())
-        {
-            _getInstance().stateEnterRequests_.push_back((*it).second);
+        std::map<std::string, InputState*>::const_iterator it = inputStatesByName_.find(name);
+        if (it != inputStatesByName_.end())
+        {
+            stateEnterRequests_.push_back((*it).second);
             return true;
         }
@@ -1283 +1165 @@
     {
         // get pointer from the map with all stored handlers
-        std::map<std::string, InputState*>::const_iterator it = _getInstance().inputStatesByName_.find(name);
-        if (it != _getInstance().inputStatesByName_.end())
-        {
-            _getInstance().stateLeaveRequests_.push_back((*it).second);
+        std::map<std::string, InputState*>::const_iterator it = inputStatesByName_.find(name);
+        if (it != inputStatesByName_.end())
+        {
+            stateLeaveRequests_.push_back((*it).second);
             return true;
         }
         return false;
     }
+
+
+    // ############################################################
+    // #####                Console Commands                  #####
+    // ##########                                        ##########
+    // ############################################################
+
+    /**
+    @brief
+        Method for easily storing a string with the command executor. It is used by the
+        KeyDetector to get assign commands. The KeyDetector simply executes
+        the command 'storeKeyStroke myName' for each button/axis.
+    @remarks
+        This is only a temporary hack until we thourouhgly support multiple KeyBinders.
+    @param name
+        The name of the button/axis.
+    */
+    void InputManager::storeKeyStroke(const std::string& name)
+    {
+        getInstance().requestLeaveState("detector");
+        COUT(0) << "Binding string \"" << bindingCommmandString_s << "\" on key '" << name << "'" << std::endl;
+        CommandExecutor::execute("config KeyBinder " + name + " " + bindingCommmandString_s, false);
+    }
+
+    /**
+    @brief
+        Assigns a command string to a key/button/axis. The name is determined via KeyDetector
+        and InputManager::storeKeyStroke(.).
+    @param command
+        Command string that can be executed by the CommandExecutor
+    */
+    void InputManager::keyBind(const std::string& command)
+    {
+        bindingCommmandString_s = command;
+        getInstance().requestEnterState("detector");
+        COUT(0) << "Press any button/key or move a mouse/joystick axis" << std::endl;
+    }
+
+    /**
+    @brief
+        Starts joy stick calibration.
+    */
+    void InputManager::calibrate()
+    {
+        getInstance().bCalibrating_ = true;
+        getInstance().requestEnterState("calibrator");
+    }
 }

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

@@ -86 +86 @@
         // --> setConfigValues is private
         friend ClassIdentifier<InputManager>;
-
-    public: // static functions
-        static bool initialise(const size_t windowHnd, int windowWidth, int windowHeight,
+        // let Core class use tick(.)
+        friend Core;
+
+    public:
+        InputManager ();
+        ~InputManager();
+
+        bool initialise(const size_t windowHnd, int windowWidth, int windowHeight,
                                bool createKeyboard = true, bool createMouse = true, bool createJoySticks = false);
-        static int  numberOfKeyboards();
-        static int  numberOfMice();
-        static int  numberOfJoySticks();
-
-        static void destroy();
-
-        //static bool isModifierDown(KeyboardModifier::Enum modifier);
-        //static bool isKeyDown(KeyCode::Enum key);
-        //static const MouseState getMouseState();
-        //static const JoyStickState getJoyStickState(unsigned int ID);
-
-        static void setWindowExtents(const int width, const int height);
-
+
+        int  numberOfKeyboards() { return keyboard_ ? 1 : 0; }
+        int  numberOfMice()      { return mouse_    ? 1 : 0; }
+        int  numberOfJoySticks() { return joySticksSize_; }
+
+        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);
+        bool destroyState          (const std::string& name);
+        InputState* getState       (const std::string& name);
+        InputState* getCurrentState();
+        bool requestEnterState     (const std::string& name);
+        bool requestLeaveState     (const std::string& name);
+
+        static InputManager& getInstance()    { assert(singletonRef_s); return *singletonRef_s; }
+        static InputManager* getInstancePtr() { return singletonRef_s; }
+
+    public: // console commands
         static void storeKeyStroke(const std::string& name);
         static void keyBind(const std::string& command);
-
         static void calibrate();
-
-        static void tick(float dt);
-
-        static SimpleInputState*   createSimpleInputState  (const std::string& name, int priority);
-        static ExtendedInputState* createExtendedInputState(const std::string& name, int priority);
-        static bool destroyState (const std::string& name);
-        static InputState* getState       (const std::string& name);
-        static InputState* getCurrentState();
-        static bool requestEnterState     (const std::string& name);
-        static bool requestLeaveState     (const std::string& name);
 
     private: // functions
         // don't mess with a Singleton
-        InputManager ();
         InputManager (const InputManager&);
-        ~InputManager();
 
         // Intenal methods
-        bool _initialise(const size_t, int, int, bool, bool, bool);
         bool _initialiseKeyboard();
         bool _initialiseMouse();
@@ -131 +129 @@
         void _redimensionLists();
 
-        void _destroy();
         void _destroyKeyboard();
         void _destroyMouse();
@@ -142 +139 @@
         unsigned int _getJoystick(const OIS::JoyStickEvent& arg);
 
-        void _tick(float dt);
-
         void _updateActiveStates();
         bool _configureInputState(InputState* state, const std::string& name, int priority);
+
+        void tick(float dt);
 
         // input events
@@ -158 +155 @@
         bool sliderMoved   (const OIS::JoyStickEvent &arg, int id);
         bool povMoved      (const OIS::JoyStickEvent &arg, int id);
+        // don't remove that! Or else add OIS as dependency library to orxonox.
+        bool vector3Moved  (const OIS::JoyStickEvent &arg, int id) { return true; }
 
         void setConfigValues();
-
-        static InputManager& _getInstance();
 
     private: // variables
@@ -204 +201 @@
 
         static std::string                  bindingCommmandString_s;
-    };
-
+        static InputManager*                singletonRef_s;
+    };
 }
 

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
+    class _CoreExport InputState : public BaseObject
     {
         friend class InputManager;
 
     public:
-        InputState() : priority_(0), executorOnEnter_(0), executorOnLeave_(0) { }
+        InputState() : priority_(0), executorOnEnter_(0), executorOnLeave_(0)
+        { RegisterObject(InputState); }
         virtual ~InputState() { }
 

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;
 
@@ -48 +51 @@
         , joyStickHandlerAll_(0)
     {
+        RegisterObject(SimpleInputState);
     }
 

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

@@ -43 +43 @@
 namespace orxonox
 {
-
     class _CoreExport SimpleInputState : public InputState
     {
-
     public:
         SimpleInputState();

code/branches/gui/src/orxonox/CMakeLists.txt

@@ -7 +7 @@
   RadarViewable.cc
   Settings.cc
+
+  gui/GUIManager.cc
+  gui/OgreCEGUIRenderer.cpp
+  gui/OgreCEGUIResourceProvider.cpp
+  gui/OgreCEGUITexture.cpp
 
   overlays/OrxonoxOverlay.cc

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

@@ -104 +104 @@
    */
   Orxonox::Orxonox()
-    : ogre_(0)
-    , startLevel_(0)
+    : startLevel_(0)
     , hud_(0)
-    , radar_(0)
     //, auMan_(0)
     , timer_(0)
@@ -114 +112 @@
     , mode_(GameMode::GM_Unspecified)
     , debugRefreshTime_(0.0f)
+    , ogre_(0)
+    , inputManager_(0)
+    , radar_(0)
   {
     RegisterRootObject(Orxonox);
 
-    assert(singletonRef_s == 0);
+    //assert(singletonRef_s == 0);
+    OrxAssert(singletonRef_s == 0, "asdfasdfasdfasdfblahblah");
     singletonRef_s = this;
   }
@@ -127 +129 @@
   {
     // keep in mind: the order of deletion is very important!
-    Loader::unload();
+    if (this->timer_)
+      delete this->timer_;
+
+    Loader::unload(startLevel_);
     if (this->startLevel_)
       delete this->startLevel_;
@@ -138 +143 @@
       delete this->radar_;
 
-    Loader::close();
     //if (this->auMan_)
     //  delete this->auMan_;
-    InGameConsole::getInstance().destroy();
-    if (this->timer_)
-      delete this->timer_;
-    InputManager::destroy();
+
+    if (this->console_)
+      delete this->console_;
+
+    if (inputManager_)
+      delete inputManager_;
 
     if (this->ogre_)
@@ -153 +159 @@
     if (server_g)
       delete network::Server::getSingleton();
+
+    // this call will delete every BaseObject!
+    // But currently this will call methods of objects that exist no more
+    // The only 'memory leak' is the ParticleSpawer. They would be deleted here
+    // and call a sceneNode method that has already been destroy by the corresponding space ship.
+    //Loader::close();
 
     singletonRef_s = 0;
@@ -247 +259 @@
           // Calls the InputManager which sets up the input devices.
           // The render window width and height are used to set up the mouse movement.
-          InputManager::initialise(ogre_->getWindowHandle(),
+          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);
+          inputManager_->createSimpleInputState("game", 20)->setHandler(keyBinder);
 
           // Load the InGameConsole
-          InGameConsole::getInstance().initialise();
+          console_ = new InGameConsole();
+          console_->initialise();
 
           // load the CEGUI interface
@@ -342 +356 @@
       if (success)
       {
-        InputManager::requestEnterState("game");
+        InputManager::getInstance().requestEnterState("game");
         this->mode_ = mode;
       }

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

@@ -84 +84 @@
 
     private:
-      GraphicsEngine*       ogre_;          //!< our dearest graphics engine <3
       Level*                startLevel_;    //!< current hard coded default level
       Level*                hud_;           //!< 'level' object fo the HUD
-      Radar*                radar_;         //!< represents the Radar (not the HUD part)
       //audio::AudioManager*  auMan_;         //!< audio manager
       Ogre::Timer*          timer_;         //!< Main loop timer
@@ -100 +98 @@
       float                 debugRefreshTime_;
 
+      // By Orxonox managed singleton pointers
+      GraphicsEngine*       ogre_;          //!< our dearest graphics engine <3
+      InputManager*         inputManager_;
+      Radar*                radar_;         //!< represents the Radar (not the HUD part)
+      InGameConsole*        console_;
+
       static Orxonox *singletonRef_s;
   };

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

@@ -117 +117 @@
 
                 // register us as input handler
-                SimpleInputState* state = InputManager::createSimpleInputState("gui", 30);
+                SimpleInputState* state = InputManager::getInstance().createSimpleInputState("gui", 30);
                 state->setHandler(this);
                 state->setJoyStickHandler(new EmptyHandler());
@@ -203 +203 @@
                 this->scriptModule_->executeScriptGlobal("showMainMenu");
 
-                InputManager::requestEnterState("gui");
+                InputManager::getInstance().requestEnterState("gui");
 
                 this->state_ = OnDisplay;
@@ -229 +229 @@
         this->guiRenderer_->setTargetSceneManager(0);
         this->state_ = Ready;
-        InputManager::requestLeaveState("gui");
+        InputManager::getInstance().requestLeaveState("gui");
     }
 

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

@@ -58 +58 @@
     SetConsoleCommand(InGameConsole, closeConsole, true);
 
+    InGameConsole* InGameConsole::singletonRef_s = 0;
+
     /**
         @brief Constructor: Creates and initializes the InGameConsole.
@@ -71 +73 @@
         RegisterObject(InGameConsole);
 
+        assert(singletonRef_s == 0);
+        singletonRef_s = this;
+
         this->bActive_ = false;
         this->cursor_ = 0.0f;
@@ -87 +92 @@
     InGameConsole::~InGameConsole(void)
     {
-        this->destroy();
-    }
-
-    /**
-        @brief Returns a reference to the only existing instance of InGameConsole.
-    */
-    InGameConsole& InGameConsole::getInstance()
-    {
-        static InGameConsole instance;
-        return instance;
-    }
-
-    /**
-        @brief Sets the config values, describing the size of the console.
-    */
-    void InGameConsole::setConfigValues()
-    {
-        SetConfigValue(relativeWidth, 0.8);
-        SetConfigValue(relativeHeight, 0.4);
-        SetConfigValue(blinkTime, 0.5);
-        SetConfigValue(scrollSpeed_, 3.0f);
-        SetConfigValue(noiseSize_, 1.0f);
-        SetConfigValue(cursorSymbol_, '|');
-    }
-
-    /**
-        @brief Initializes the InGameConsole.
-    */
-    void InGameConsole::initialise()
-    {
-        // create the corresponding input state
-        InputManager::createSimpleInputState("console", 40)->setKeyHandler(Shell::getInstance().getInputBuffer());
-
-        // create overlay and elements
-        Ogre::OverlayManager* ovMan = Ogre::OverlayManager::getSingletonPtr();
-
-        // create actual overlay
-        this->consoleOverlay_ = ovMan->create("InGameConsoleConsole");
-
-        // create a container
-        this->consoleOverlayContainer_ = static_cast<Ogre::OverlayContainer*>(ovMan->createOverlayElement("Panel", "InGameConsoleContainer"));
-        this->consoleOverlayContainer_->setMetricsMode(Ogre::GMM_RELATIVE);
-        this->consoleOverlayContainer_->setPosition((1 - this->relativeWidth) / 2, 0);
-        this->consoleOverlayContainer_->setDimensions(this->relativeWidth, this->relativeHeight);
-        this->consoleOverlay_->add2D(this->consoleOverlayContainer_);
-
-        // create BorderPanel
-        this->consoleOverlayBorder_ = static_cast<Ogre::BorderPanelOverlayElement*>(ovMan->createOverlayElement("BorderPanel", "InGameConsoleBorderPanel"));
-        this->consoleOverlayBorder_->setMetricsMode(Ogre::GMM_PIXELS);
-        this->consoleOverlayBorder_->setMaterialName("ConsoleCenter");
-        this->consoleOverlayBorder_->setBorderSize(16, 16, 0, 16);
-        this->consoleOverlayBorder_->setBorderMaterialName("ConsoleBorder");
-        this->consoleOverlayBorder_->setLeftBorderUV(0.0, 0.49, 0.5, 0.51);
-        this->consoleOverlayBorder_->setRightBorderUV(0.5, 0.49, 1.0, 0.5);
-        this->consoleOverlayBorder_->setBottomBorderUV(0.49, 0.5, 0.51, 1.0);
-        this->consoleOverlayBorder_->setBottomLeftBorderUV(0.0, 0.5, 0.5, 1.0);
-        this->consoleOverlayBorder_->setBottomRightBorderUV(0.5, 0.5, 1.0, 1.0);
-        this->consoleOverlayContainer_->addChild(this->consoleOverlayBorder_);
-
-        // create a new font to match the requested size exactly
-        Ogre::FontPtr font = static_cast<Ogre::FontPtr>
-            (Ogre::FontManager::getSingleton().create("MonofurConsole", "General"));
-        font->setType(Ogre::FT_TRUETYPE);
-        font->setSource("Monofur.ttf");
-        font->setTrueTypeSize(18);
-        // reto: I don't know why, but setting the resolution twice as high makes the font look a lot clearer
-        font->setTrueTypeResolution(192);
-        font->addCodePointRange(Ogre::Font::CodePointRange(33, 126));
-        font->addCodePointRange(Ogre::Font::CodePointRange(161, 255));
-
-        // create the text lines
-        this->consoleOverlayTextAreas_ = new Ogre::TextAreaOverlayElement*[LINES];
-        for (int i = 0; i < LINES; i++)
-        {
-            this->consoleOverlayTextAreas_[i] = static_cast<Ogre::TextAreaOverlayElement*>(ovMan->createOverlayElement("TextArea", "InGameConsoleTextArea" + convertToString(i)));
-            this->consoleOverlayTextAreas_[i]->setMetricsMode(Ogre::GMM_PIXELS);
-            this->consoleOverlayTextAreas_[i]->setFontName("MonofurConsole");
-            this->consoleOverlayTextAreas_[i]->setCharHeight(18);
-            this->consoleOverlayTextAreas_[i]->setParameter("colour_top", "0.21 0.69 0.21");
-            this->consoleOverlayTextAreas_[i]->setLeft(8);
-            this->consoleOverlayTextAreas_[i]->setCaption("");
-            this->consoleOverlayContainer_->addChild(this->consoleOverlayTextAreas_[i]);
-        }
-
-        // create cursor (also a text area overlay element)
-        this->consoleOverlayCursor_ = static_cast<Ogre::TextAreaOverlayElement*>(ovMan->createOverlayElement("TextArea", "InGameConsoleCursor"));
-        this->consoleOverlayCursor_->setMetricsMode(Ogre::GMM_PIXELS);
-        this->consoleOverlayCursor_->setFontName("MonofurConsole");
-        this->consoleOverlayCursor_->setCharHeight(18);
-        this->consoleOverlayCursor_->setParameter("colour_top", "0.21 0.69 0.21");
-        this->consoleOverlayCursor_->setLeft(7);
-        this->consoleOverlayCursor_->setCaption(std::string(this->cursorSymbol_, 1));
-        this->consoleOverlayContainer_->addChild(this->consoleOverlayCursor_);
-
-        // create noise
-        this->consoleOverlayNoise_ = static_cast<Ogre::PanelOverlayElement*>(ovMan->createOverlayElement("Panel", "InGameConsoleNoise"));
-        this->consoleOverlayNoise_->setMetricsMode(Ogre::GMM_PIXELS);
-        this->consoleOverlayNoise_->setPosition(5,0);
-        this->consoleOverlayNoise_->setMaterialName("ConsoleNoiseSmall");
-        // comment following line to disable noise
-        this->consoleOverlayContainer_->addChild(this->consoleOverlayNoise_);
-
-        this->windowResized(GraphicsEngine::getSingleton().getWindowWidth(), GraphicsEngine::getSingleton().getWindowHeight());
-
-        // move overlay "above" the top edge of the screen
-        // we take -1.2 because the border makes the panel bigger
-        this->consoleOverlayContainer_->setTop(-1.2 * this->relativeHeight);
-
-        Shell::getInstance().addOutputLevel(true);
-
-        COUT(4) << "Info: InGameConsole initialized" << std::endl;
-    }
-
-    /**
-        @brief Destroys all the elements if necessary.
-    */
-    void InGameConsole::destroy()
-    {
         this->deactivate();
 
-        // destroy the input state previously created
-        SimpleInputState * inputState = dynamic_cast<SimpleInputState*>(InputManager::getState("console"));
-        if (inputState)
-            InputManager::destroyState("console");
+        // destroy the input state previously created (InputBuffer gets destroyed by the Shell)
+        InputManager::getInstance().destroyState("console");
 
         Ogre::OverlayManager* ovMan = Ogre::OverlayManager::getSingletonPtr();
@@ -239 +124 @@
             this->consoleOverlayTextAreas_ = 0;
         }
+
+        singletonRef_s = 0;
+    }
+
+    /**
+        @brief Sets the config values, describing the size of the console.
+    */
+    void InGameConsole::setConfigValues()
+    {
+        SetConfigValue(relativeWidth, 0.8);
+        SetConfigValue(relativeHeight, 0.4);
+        SetConfigValue(blinkTime, 0.5);
+        SetConfigValue(scrollSpeed_, 3.0f);
+        SetConfigValue(noiseSize_, 1.0f);
+        SetConfigValue(cursorSymbol_, '|');
+    }
+
+    /**
+        @brief Initializes the InGameConsole.
+    */
+    void InGameConsole::initialise()
+    {
+        // create the corresponding input state
+        InputManager::getInstance().createSimpleInputState("console", 40)
+            ->setKeyHandler(Shell::getInstance().getInputBuffer());
+
+        // create overlay and elements
+        Ogre::OverlayManager* ovMan = Ogre::OverlayManager::getSingletonPtr();
+
+        // create actual overlay
+        this->consoleOverlay_ = ovMan->create("InGameConsoleConsole");
+
+        // create a container
+        this->consoleOverlayContainer_ = static_cast<Ogre::OverlayContainer*>(ovMan->createOverlayElement("Panel", "InGameConsoleContainer"));
+        this->consoleOverlayContainer_->setMetricsMode(Ogre::GMM_RELATIVE);
+        this->consoleOverlayContainer_->setPosition((1 - this->relativeWidth) / 2, 0);
+        this->consoleOverlayContainer_->setDimensions(this->relativeWidth, this->relativeHeight);
+        this->consoleOverlay_->add2D(this->consoleOverlayContainer_);
+
+        // create BorderPanel
+        this->consoleOverlayBorder_ = static_cast<Ogre::BorderPanelOverlayElement*>(ovMan->createOverlayElement("BorderPanel", "InGameConsoleBorderPanel"));
+        this->consoleOverlayBorder_->setMetricsMode(Ogre::GMM_PIXELS);
+        this->consoleOverlayBorder_->setMaterialName("ConsoleCenter");
+        this->consoleOverlayBorder_->setBorderSize(16, 16, 0, 16);
+        this->consoleOverlayBorder_->setBorderMaterialName("ConsoleBorder");
+        this->consoleOverlayBorder_->setLeftBorderUV(0.0, 0.49, 0.5, 0.51);
+        this->consoleOverlayBorder_->setRightBorderUV(0.5, 0.49, 1.0, 0.5);
+        this->consoleOverlayBorder_->setBottomBorderUV(0.49, 0.5, 0.51, 1.0);
+        this->consoleOverlayBorder_->setBottomLeftBorderUV(0.0, 0.5, 0.5, 1.0);
+        this->consoleOverlayBorder_->setBottomRightBorderUV(0.5, 0.5, 1.0, 1.0);
+        this->consoleOverlayContainer_->addChild(this->consoleOverlayBorder_);
+
+        // create a new font to match the requested size exactly
+        Ogre::FontPtr font = static_cast<Ogre::FontPtr>
+            (Ogre::FontManager::getSingleton().create("MonofurConsole", "General"));
+        font->setType(Ogre::FT_TRUETYPE);
+        font->setSource("Monofur.ttf");
+        font->setTrueTypeSize(18);
+        // reto: I don't know why, but setting the resolution twice as high makes the font look a lot clearer
+        font->setTrueTypeResolution(192);
+        font->addCodePointRange(Ogre::Font::CodePointRange(33, 126));
+        font->addCodePointRange(Ogre::Font::CodePointRange(161, 255));
+
+        // create the text lines
+        this->consoleOverlayTextAreas_ = new Ogre::TextAreaOverlayElement*[LINES];
+        for (int i = 0; i < LINES; i++)
+        {
+            this->consoleOverlayTextAreas_[i] = static_cast<Ogre::TextAreaOverlayElement*>(ovMan->createOverlayElement("TextArea", "InGameConsoleTextArea" + convertToString(i)));
+            this->consoleOverlayTextAreas_[i]->setMetricsMode(Ogre::GMM_PIXELS);
+            this->consoleOverlayTextAreas_[i]->setFontName("MonofurConsole");
+            this->consoleOverlayTextAreas_[i]->setCharHeight(18);
+            this->consoleOverlayTextAreas_[i]->setParameter("colour_top", "0.21 0.69 0.21");
+            this->consoleOverlayTextAreas_[i]->setLeft(8);
+            this->consoleOverlayTextAreas_[i]->setCaption("");
+            this->consoleOverlayContainer_->addChild(this->consoleOverlayTextAreas_[i]);
+        }
+
+        // create cursor (also a text area overlay element)
+        this->consoleOverlayCursor_ = static_cast<Ogre::TextAreaOverlayElement*>(ovMan->createOverlayElement("TextArea", "InGameConsoleCursor"));
+        this->consoleOverlayCursor_->setMetricsMode(Ogre::GMM_PIXELS);
+        this->consoleOverlayCursor_->setFontName("MonofurConsole");
+        this->consoleOverlayCursor_->setCharHeight(18);
+        this->consoleOverlayCursor_->setParameter("colour_top", "0.21 0.69 0.21");
+        this->consoleOverlayCursor_->setLeft(7);
+        this->consoleOverlayCursor_->setCaption(std::string(this->cursorSymbol_, 1));
+        this->consoleOverlayContainer_->addChild(this->consoleOverlayCursor_);
+
+        // create noise
+        this->consoleOverlayNoise_ = static_cast<Ogre::PanelOverlayElement*>(ovMan->createOverlayElement("Panel", "InGameConsoleNoise"));
+        this->consoleOverlayNoise_->setMetricsMode(Ogre::GMM_PIXELS);
+        this->consoleOverlayNoise_->setPosition(5,0);
+        this->consoleOverlayNoise_->setMaterialName("ConsoleNoiseSmall");
+        // comment following line to disable noise
+        this->consoleOverlayContainer_->addChild(this->consoleOverlayNoise_);
+
+        this->windowResized(GraphicsEngine::getSingleton().getWindowWidth(), GraphicsEngine::getSingleton().getWindowHeight());
+
+        // move overlay "above" the top edge of the screen
+        // we take -1.2 because the border makes the panel bigger
+        this->consoleOverlayContainer_->setTop(-1.2 * this->relativeHeight);
+
+        Shell::getInstance().addOutputLevel(true);
+
+        COUT(4) << "Info: InGameConsole initialized" << std::endl;
     }
 
@@ -491 +480 @@
         {
             this->bActive_ = true;
-            InputManager::requestEnterState("console");
+            InputManager::getInstance().requestEnterState("console");
             Shell::getInstance().registerListener(this);
 
@@ -513 +502 @@
         {
             this->bActive_ = false;
-            InputManager::requestLeaveState("console");
+            InputManager::getInstance().requestLeaveState("console");
             Shell::getInstance().unregisterListener(this);
 

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

@@ -46 +46 @@
     {
     public: // functions
+        InGameConsole();
+        ~InGameConsole();
+
         void initialise();
         void destroy();
@@ -52 +55 @@
         void tick(float dt);
 
-        static InGameConsole& getInstance();
+        static InGameConsole& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
+        static InGameConsole* getInstancePtr() { return singletonRef_s; }
 
         static void openConsole();
@@ -58 +62 @@
 
     private: // functions
-        InGameConsole();
         InGameConsole(const InGameConsole& other) {}
-        ~InGameConsole();
 
         void activate();
@@ -107 +109 @@
         float noiseSize_;
         char cursorSymbol_;
+
+        static InGameConsole* singletonRef_s;
     };
 }

code/branches/gui/src/tolua/CMakeLists.txt

@@ -15 +15 @@
 SET (TOLUAEXE_SRC_FILES
   tolua.c
-  toluabind.c
+  toluabind_orxonox.c
 )
 

code/branches/gui/visual_studio/base_properties.vsprops

@@ -9 +9 @@
                 Name="VCCLCompilerTool"
                 AdditionalIncludeDirectories=""$(RootDir)";"$(RootDir)src";"$(RootDir)src\orxonox";"$(RootDir)src\tolua";"$(RootDir)src\ois";"$(LibDir)ogre-1.4.8\OgreMain\include";"$(LibDir)boost-1.35.0";"$(LibDir)cegui-0.6.1\include";"$(LibDir)cegui-0.6.1\ScriptingModules\CEGUILua\LuaScriptModule\include";"$(LibDir)enet-1.2\include";"$(LibDir)libogg-1.1.3\include";"$(LibDir)libvorbis-1.2.0\include";"$(LibDir)lua-5.1.3\src";"$(LibDir)openal-1.1\include";"$(LibDir)openal-1.1\alut\include";"$(LibDir)tcl-8.5.\generic";"$(LibDir)zlib-1.2.3";"$(LibDir)ogre-1.4.9\Samples\Common\CEGUIRenderer\include""
-                AdditionalOptions="/MP2"
                 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB; ZLIB_WINAPI"
                 WarningLevel="3"

code/branches/gui/visual_studio/core_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
+                AdditionalOptions="/MP2"
                 PreprocessorDefinitions="CORE_SHARED_BUILD"
         />

code/branches/gui/visual_studio/network_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
+                AdditionalOptions="/MP2"
                 PreprocessorDefinitions="ORXONOX_NO_EXPORTS;NETWORK_STATIC_BUILD;WIN32_LEAN_AND_MEAN"
         />

code/branches/gui/visual_studio/orxonox_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
+                AdditionalOptions="/MP2"
                 PreprocessorDefinitions="ORXONOX_NO_EXPORTS;NETWORK_STATIC_BUILD;OGRE_GUIRENDERER_EXPORTS"
                 UsePrecompiledHeader="2"