Changeset 9805 for code/branches/wiimote/src/libraries/core/input/InputManager.cc

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.

File:

• code/branches/wiimote/src/libraries/core/input/InputManager.cc (modified) (2 diffs)

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_)