Changeset 9919

Timestamp:

Dec 16, 2013, 4:05:33 PM (11 years ago)

Author:

georgr

Message:

boost mapped to B; roll, steering and acceleration(c/Z) all working.

File:

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

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

@@ -16 +16 @@
                 IntVector2 o(0,0);
                 float r = 0; //roll variable
+                if (p->ExpansionDevice.GetType()!=CExpansionDevice::TYPE_NUNCHUK)
+                        {
+                                p->UpdateStatus();
+                                PWii->RefreshWiimotes();
+                        }
                 for (int i=0; i<4; i++)
                 {
@@ -29 +34 @@
                                                                 CommandExecutor::execute("fire 0", 0, 0);
                                                         }
+                                                        if(p->Buttons.isPressed(CButtons::BUTTON_B)||p->Buttons.isJustPressed(CButtons::BUTTON_B))
+                                                                CommandExecutor::execute("boost");
                                                         if(p->ExpansionDevice.GetType()==CExpansionDevice::TYPE_NUNCHUK)
                                                         {
@@ -54 +61 @@
                 r/=4;
                 std::stringstream temp;
-//              temp << "scale ";
-                if (r>0)
-                        temp << "HumanController rotateRoll 1,1";
-                if (r<0)
-                        temp << "HumanController rotateRoll -1,-1";
+                if (r>4.5)
+                        temp << "HumanController rotateRoll " << r/6 << ",1";
+                if (r<-4.5)
+                        temp << "HumanController rotateRoll "<< r/6 << ",-1";
                 if (r==0)
                         temp << "";
-//              temp << " rotateRoll";
-
                 string com = temp.str();
-                //orxout()<<com<<endl;
                 CommandExecutor::execute(com, 0, 0);
 
@@ -71 +74 @@
                 IntVector2 clippingSize(1920, 1080);
                 p->IR.GetCursorPosition(o.x, o.y);
-                //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);
@@ -84 +85 @@
                 lastCursor.x = o.x;
                 lastCursor.y = o.y;
-                lastOrientation.roll = r;
 
         }