Changeset 9917 for code/branches/wiimote/src/libraries/core/input

Timestamp:

Dec 16, 2013, 3:35:48 PM (11 years ago)

Author:

georgr

Message:

HumanController rotateRoll needs a vector as argument… the moar you know

File:

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

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

@@ -29 +29 @@
                                                                 CommandExecutor::execute("fire 0", 0, 0);
                                                         }
-//                                                      if(p->ExpansionDevice.GetType()==CExpansionDevice::TYPE_NUNCHUK)
-//                                                      {
-//                                                              if(p->ExpansionDevice.Nunchuk.Buttons.isPressed(CNunchukButtons::BUTTON_C))
-//                                                                      CommandExecutor::execute("NewHumanController accelerate");
-//                                                              if(p->ExpansionDevice.Nunchuk.Buttons.isPressed(CNunchukButtons::BUTTON_Z))
-//                                                                      CommandExecutor::execute("NewHumanController decelerate");
-//                                                      }
-//                                                      float dummyPitch, dummyYaw, dummyRoll;
-//                                                      p->Accelerometer.GetOrientation(dummyPitch, dummyRoll, dummyYaw);
-//                                                      r += dummyRoll;
+                                                        if(p->ExpansionDevice.GetType()==CExpansionDevice::TYPE_NUNCHUK)
+                                                        {
+                                                                if(p->ExpansionDevice.Nunchuk.Buttons.isPressed(CNunchukButtons::BUTTON_C))
+                                                                        CommandExecutor::execute("NewHumanController accelerate");
+                                                                if(p->ExpansionDevice.Nunchuk.Buttons.isPressed(CNunchukButtons::BUTTON_Z))
+                                                                        CommandExecutor::execute("NewHumanController decelerate");
+                                                        }
+                                                        float dummyPitch, dummyYaw, dummyRoll;
+                                                        p->Accelerometer.GetOrientation(dummyPitch, dummyRoll, dummyYaw);
+                                                        r += dummyRoll;
                                                         break;
                                                 }
@@ -52 +52 @@
                                 }
                 }
-//              r/=4;
-//              std::stringstream temp;
+                r/=4;
+                std::stringstream temp;
 //              temp << "scale ";
-//              temp << (r-lastOrientation.roll);
+                if (r>0)
+                        temp << "HumanController rotateRoll 1,1";
+                if (r<0)
+                        temp << "HumanController rotateRoll -1,-1";
+                if (r==0)
+                        temp << "";
 //              temp << " rotateRoll";
-//              string com = temp.str();
-//              orxout()<<com<<endl;
-//              //CommandExecutor::execute(com, 0, 0);
+
+                string com = temp.str();
+                //orxout()<<com<<endl;
+                CommandExecutor::execute(com, 0, 0);
 
                 IntVector2 abs(0,0);
@@ -65 +71 @@
                 IntVector2 clippingSize(1920, 1080);
                 p->IR.GetCursorPosition(o.x, o.y);
-//              orxout() << "y: " << o.y << " x: " << o.x << endl;
-//              orxout() << p->IR.GetNumDots() << endl;
+                //orxout() << "y: " << o.y << " x: " << o.x << endl;
+                //orxout() << p->IR.GetNumDots() << endl;
                 rel.x = (o.x-lastCursor.x);
                 rel.y = (o.y-lastCursor.y);