Changeset 3310 for code/branches/core4/src

Timestamp:

Jul 19, 2009, 12:27:53 PM (15 years ago)

Author:

rgrieder

Message:

Optimisations in the pathway of the input. Nobody will ever notice the difference in performance (immeasurable), but I love the beauty of having all my template code inlined when it even decreases code size (because the code gets inlined exactly once).

Location:

code/branches/core4/src

Files:

• core/input/InputDevice.h (modified) (2 diffs)
• core/input/InputManager.cc (modified) (1 diff)
• core/input/InputState.h (modified) (6 diffs)
• core/input/Mouse.cc (modified) (1 diff)
• orxonox/gui/GUIManager.cc (modified) (1 diff)

code/branches/core4/src/core/input/InputDevice.h

@@ -181 +181 @@
     protected:
         //! Common code for all button pressed events (updates pressed buttons list and calls the input states)
-        void buttonPressed(ButtonTypeParam button)
+        FORCEINLINE void buttonPressed(ButtonTypeParam button)
         {
             // check whether the button already is in the list (can happen when focus was lost)
@@ -198 +198 @@
 
         //! Common code for all button released events (updates pressed buttons list and calls the input states)
-        void buttonReleased(ButtonTypeParam button)
+        FORCEINLINE void buttonReleased(ButtonTypeParam button)
         {
             // remove the button from the pressedButtons_ list

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

@@ -177 +177 @@
         paramList.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
 #if defined(ORXONOX_PLATFORM_WINDOWS)
-        //paramList.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_NONEXCLUSIVE")));
-        //paramList.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_FOREGROUND")));
-        //paramList.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_NONEXCLUSIVE")));
-        //paramList.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_FOREGROUND")));
+        paramList.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_NONEXCLUSIVE")));
+        paramList.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_FOREGROUND")));
+        paramList.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_NONEXCLUSIVE")));
+        paramList.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_FOREGROUND")));
 #elif defined(ORXONOX_PLATFORM_LINUX)
         paramList.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));

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

@@ -174 +174 @@
     };
 
-    inline void InputState::update(float dt)
+    FORCEINLINE void InputState::update(float dt)
     {
         for (unsigned int i = 0; i < handlers_.size(); ++i)
@@ -181 +181 @@
     }
 
-    inline void InputState::update(float dt, unsigned int device)
+    FORCEINLINE void InputState::update(float dt, unsigned int device)
     {
         switch (device)
@@ -203 +203 @@
 
     template <typename EventType, class Traits>
-    inline void InputState::buttonEvent(unsigned int device, const typename Traits::ButtonTypeParam button)
+    FORCEINLINE void InputState::buttonEvent(unsigned int device, const typename Traits::ButtonTypeParam button)
     {
         assert(device < handlers_.size());
@@ -210 +210 @@
     }
 
-    inline void InputState::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
+    FORCEINLINE void InputState::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
     {
         if (handlers_[mouseIndex_s] != NULL)
@@ -216 +216 @@
     }
 
-    inline void InputState::mouseScrolled(int abs, int rel)
+    FORCEINLINE void InputState::mouseScrolled(int abs, int rel)
     {
         if (handlers_[mouseIndex_s] != NULL)
@@ -222 +222 @@
     }
 
-    inline void InputState::joyStickAxisMoved(unsigned int device, unsigned int axis, float value)
+    FORCEINLINE void InputState::joyStickAxisMoved(unsigned int device, unsigned int axis, float value)
     {
         assert(device < handlers_.size());

code/branches/core4/src/core/input/Mouse.cc

@@ -45 +45 @@
     {
         RegisterRootObject(Mouse);
-        this->windowResized(this->getWindowHeight(), this->getWindowHeight());
+        this->windowResized(this->getWindowWidth(), this->getWindowHeight());
 
 #ifdef ORXONOX_PLATFORM_LINUX

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

@@ -420 +420 @@
     void GUIManager::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
     {
-        guiSystem_->injectMouseMove(static_cast<float>(rel.x), static_cast<float>(rel.y));
+        //guiSystem_->injectMouseMove(static_cast<float>(rel.x), static_cast<float>(rel.y));
+        guiSystem_->injectMousePosition(static_cast<float>(abs.x), static_cast<float>(abs.y));
     }
     void GUIManager::mouseScrolled(int abs, int rel)