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

Timestamp:

Dec 9, 2013, 1:04:09 PM (11 years ago)

Author:

georgr

Message:

lag sorta fixed - it disappears after ~40s, but will reappear for unknown reasons

File:

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

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

@@ -255 +255 @@
             wiimote.SetLEDs(LED_MAP[index]);
             try
-                       {
-                         orxout()<< "Size of devices vector before wiimote insertion:" << devices_.size() << std::endl;
-                         devices_.push_back(new WiiMote((unsigned int)devices_.size(), *i, wii));
-                         //devices_[2] = new WiiMote(devices_.size(), *(new CWiimote()));
-                         orxout()<< "Size of devices vector after wiimote insertion:" << devices_.size() << std::endl;
-                         wiimote.SetMotionSensingMode(CWiimote::ON);
-
-                       }
-                       catch(std::exception& e)  //gotta catch em all
-                       {
-                         orxout()<<"Exception loading WiiMote!!!1!11!";
-                       }
+                   {
+                         orxout()<< "Size of devices vector before wiimote insertion:" << devices_.size() << std::endl;
+                         devices_.push_back(new WiiMote((unsigned int)devices_.size(), *i, wii));
+                         //devices_[2] = new WiiMote(devices_.size(), *(new CWiimote()));
+                         orxout()<< "Size of devices vector after wiimote insertion:" << devices_.size() << std::endl;
+                         wiimote.SetMotionSensingMode(CWiimote::ON);
+
+                   }
+                   catch(std::exception& e)  //gotta catch em all
+                   {
+                         orxout()<<"Exception loading WiiMote!!!1!11!";
+                   }
 
 
@@ -432 +432 @@
             }
         }
+
         if (bUpdateRequired)
             updateActiveStates();
@@ -437 +438 @@
         // Capture all the input and collect the function calls
         // No event gets triggered here yet!
+
         BOOST_FOREACH(InputDevice* device, devices_)
-            if (device != NULL)
+            if (device != NULL || device->getDeviceID()!=2)
                 device->update(time);
+        devices_[2]->update(time);
+
 
         // Collect function calls for the update