Changeset 9850

Timestamp:

Dec 2, 2013, 3:35:38 PM (11 years ago)

Author:

georgr

Message:

A should fire main lazors now

Location:

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

Files:

• WiiMote.cc (modified) (3 diffs)
• WiiMote.h (modified) (1 diff)

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

@@ -1 +1 @@
 #include "WiiMote.h"
 #include "core/CoreIncludes.h"
-#include "core/command/ConsoleCommand.h"
+//#include "core/command/ConsoleCommand.h"
 #include <wiicpp/wiicpp/wiicpp.h>
+
 
 namespace orxonox
@@ -13 +14 @@
                 if(p == NULL)
               exit(0);
-                else
-                  orxout(user_warning) << "pointer is not null, yay" << std::endl;
+                //else
+                  //orxout(user_warning) << "pointer is not null, yay" << std::endl;
                 if (PWii->Poll())
                 {
                         CWiimote::EventTypes e = p->GetEvent();
                         if(p->Buttons.isPressed(CButtons::BUTTON_A))
-                                orxout()<<"ZOMG!!1!"<<endl;
+                                {
+                                        CE->execute("fire 0", 0, 0);
+                                }
                         Orientation o;
                         p->SetMotionSensingMode(CWiimote::ON);
                         p->Accelerometer.GetOrientation(o.pitch, o.roll, o.yaw);
-                        int x = (int)((o.yaw-lastOrientation.yaw)/time.getDeltaTime());
+                        int x = (int)(500*(o.yaw-lastOrientation.yaw)/time.getDeltaTime());
                         int y = (int)((o.pitch-lastOrientation.pitch)/time.getDeltaTime());
                         IntVector2 abs(0, 0);
@@ -55 +58 @@
                 lastOrientation.roll = 0;
                 lastOrientation.pitch = 0;
+                CE = &(CommandExecutor::getInstance());
 
         }

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

@@ -42 +42 @@
                  CWiimote * p;
                  CWii * PWii; //parent "wii" the wiimote is registered to
+                 CommandExecutor * CE;
         };
 };