Changeset 9805

Timestamp:

Nov 24, 2013, 11:15:46 AM (10 years ago)

Author:

smerkli

Message:

• Converted some absolute paths into relative ones
• Increased the handlers_ vector size by 1 as a hack to get the wiimote working in this branch (This will have to be cleanly redone once I have a better concept for wiimotes and joysticks)
• Removed a local inputStates_ variable that georgr added in wiimote, it shadowed the one from the basis class and hence never got any entries

To be discussed with georgr on monday.

Location:

code/branches/wiimote/src/libraries/core/input

Files:

• InputManager.cc (modified) (2 diffs)
• InputState.cc (modified) (2 diffs)
• InputState.h (modified) (1 diff)
• WiiMote.h (modified) (1 diff)
• Wiimote_Test.cc (modified) (1 diff)

code/branches/wiimote/src/libraries/core/input/InputManager.cc

@@ -254 +254 @@
 
         }
-            try
-            {
-                orxout()<<devices_.size();
-                    devices_.push_back(new WiiMote(devices_.size(), *(new CWiimote())));
-                //devices_[2] = new WiiMote(devices_.size(), *(new CWiimote()));
-
-            }
-            catch(std::exception& e)  //gotta catch em all
-            {
-                      orxout()<<"Exception loading WiiMote!!!1!11!";
-            }
+            try
+            {
+              orxout()<< "Size of devices vector before wiimote insertion:" << devices_.size() << std::endl;
+              devices_.push_back(new WiiMote(devices_.size(), *(new CWiimote())));
+              //devices_[2] = new WiiMote(devices_.size(), *(new CWiimote()));
+              orxout()<< "Size of devices vector after wiimote insertion:" << devices_.size() << std::endl;
+
+            }
+            catch(std::exception& e)  //gotta catch em all
+            {
+              orxout()<<"Exception loading WiiMote!!!1!11!";
+            }
 
     }
@@ -475 +476 @@
                 if (rit->second->isInputDeviceEnabled(i) && (!occupied || rit->second->bAlwaysGetsInput_))
                 {
-                        orxout() << "Success with ID " << i <<std::endl;
+                    orxout() << "Success with ID " << i <<std::endl;
                     states.push_back(rit->second);
                     if (!rit->second->bTransparent_)

code/branches/wiimote/src/libraries/core/input/InputState.cc

@@ -49 +49 @@
             priority_ = 0;
 
-        handlers_.resize(InputDeviceEnumerator::FirstJoyStick + this->getJoyStickList().size(), NULL);
+        // SANDRO HACK: make this 1 larger so we can have the wiimote read out as well
+        //handlers_.resize(InputDeviceEnumerator::FirstJoyStick + this->getJoyStickList().size(), NULL);
+        handlers_.resize(InputDeviceEnumerator::FirstJoyStick 
+          + 1 +  this->getJoyStickList().size(), NULL);
     }
 
@@ -98 +101 @@
         setMouseHandler(handler);
         setJoyStickHandler(handler);
+        setWiiMoteHandler(handler); // SANDRO HACK
     }
 

code/branches/wiimote/src/libraries/core/input/InputState.h

@@ -100 +100 @@
         void setMouseHandler   (InputHandler* handler)
             { handlers_[mouseIndex_s]    = handler; bExpired_ = true; }
+
+        // SANDRO HACK
+        void setWiiMoteHandler(InputHandler* handler)
+        { // TODO make this a dynamically chosen number
+          handlers_[2]    = handler; bExpired_ = true;
+        }
+
         /**
         @brief

code/branches/wiimote/src/libraries/core/input/WiiMote.h

@@ -31 +31 @@
                  void calibrationStopped() { }
                  //! List of all input states that receive events from this device
-                 std::vector<InputState*> inputStates_;
+                 //std::vector<InputState*> inputStates_;
 
          private:

code/branches/wiimote/src/libraries/core/input/Wiimote_Test.cc

@@ -6 +6 @@
  */
 
-#include "/usr/tardis/home-itet-ab/georgr-extra-0/orxonox/wiimote/src/libraries/core/input/Wiimote_Test.h"
+#include "Wiimote_Test.h"
 #include "core/CoreIncludes.h"
 #include "core/command/ConsoleCommand.h"
 #include "InputState.h"
-#include </usr/tardis/home-itet-ab/georgr-extra-0/orxonox/wiimote/src/orxonox/OrxonoxPrereqs.h>
 #include "InputManager.h"
-#include </usr/tardis/home-itet-ab/georgr-extra-0/orxonox/wiimote/src/libraries/util/UtilPrereqs.h>
-#include </usr/tardis/home-itet-ab/georgr-extra-0/orxonox/wiimote/src/libraries/util/ScopedSingletonManager.h>
+#include <util/UtilPrereqs.h>
+#include <util/ScopedSingletonManager.h>