Changeset 9838

Timestamp:

Dec 2, 2013, 2:09:41 PM (11 years ago)

Author:

georgr

Message:

developing on 2 PCs is a lot of fun, bluetooth is a rare commodity… wiimote should connect properly now

Location:

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

Files:

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

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

@@ -255 +255 @@
                        {
                          orxout()<< "Size of devices vector before wiimote insertion:" << devices_.size() << std::endl;
-                         devices_.push_back(new WiiMote(devices_.size(), *i));
+                         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;

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

@@ -14 +14 @@
               exit(0);
                 else
-                  orxout(user_warning) << 'pointer is not null, yay' << std::endl;
-                CWiimote::EventTypes e = p->GetEvent();
-                if(p->Buttons.isPressed(CButtons::BUTTON_A))
-                        orxout()<<"ZOMG!!1!"<<endl;
-                Orientation o;
-                p->Accelerometer.GetOrientation(o.pitch, o.roll, o.yaw);
-                int x = (int)((o.yaw-lastOrientation.yaw)*time.getDeltaTime());
-                int y = (int)((o.pitch-lastOrientation.pitch)*time.getDeltaTime());
-                IntVector2 abs(0, 0);
-                IntVector2 rel(x, y);
-                IntVector2 clippingSize(1920, 1080);
-                if(x!=0&&y!=0)
+                  orxout(user_warning) << "pointer is not null, yay" << std::endl;
+                if (PWii->Poll())
                 {
-                        for (unsigned int i = 0; i < inputStates_.size(); ++i)
-                                        inputStates_[i]->mouseMoved(abs, rel, clippingSize);
+                        CWiimote::EventTypes e = p->GetEvent();
+                        if(p->Buttons.isPressed(CButtons::BUTTON_A))
+                                orxout()<<"ZOMG!!1!"<<endl;
+                        Orientation o;
+                        p->Accelerometer.GetOrientation(o.pitch, o.roll, o.yaw);
+                        int x = (int)((o.yaw-lastOrientation.yaw)*time.getDeltaTime());
+                        int y = (int)((o.pitch-lastOrientation.pitch)*time.getDeltaTime());
+                        IntVector2 abs(0, 0);
+                        IntVector2 rel(x, y);
+                        IntVector2 clippingSize(1920, 1080);
+                        if(x!=0&&y!=0)
+                        {
+                                for (unsigned int i = 0; i < inputStates_.size(); ++i)
+                                                                inputStates_[i]->mouseMoved(abs, rel, clippingSize);
+                        }
                 }
 
@@ -41 +44 @@
 
         }
-        WiiMote::WiiMote(unsigned int id, CWiimote & parent)  : InputDevice(id)
+        WiiMote::WiiMote(unsigned int id, CWiimote & parent, CWii & parentWii)  : InputDevice(id)
         {
                 p = &parent;
-
+                PWii = &parentWii;
                 lastOrientation.yaw = 0;
                 lastOrientation.roll = 0;

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

@@ -21 +21 @@
          public:
                         //! Only resets the members
-                WiiMote(unsigned int id, CWiimote & parent);
+                WiiMote(unsigned int id, CWiimote & parent, CWii & parentWii);
                 ~WiiMote() { }
                 //! Returns the device class (derived) name as string
@@ -41 +41 @@
                  void test(int x, int y);
                  CWiimote * p;
+                 CWii * PWii; //parent "wii" the wiimote is registered to
         };
 };