[Orxonox-commit 5188] r9853 - code/branches/wiimote/src/libraries/core/input

[georgr at orxonox.net]

Author: georgr
Date: 2013-12-02 15:49:14 +0100 (Mon, 02 Dec 2013)
New Revision: 9853

Modified:
   code/branches/wiimote/src/libraries/core/input/WiiMote.cc
   code/branches/wiimote/src/libraries/core/input/WiiMote.h
Log:
A should fire main lazors now, 3rd try

Modified: code/branches/wiimote/src/libraries/core/input/WiiMote.cc
===================================================================
--- code/branches/wiimote/src/libraries/core/input/WiiMote.cc	2013-12-02 14:42:24 UTC (rev 9852)
+++ code/branches/wiimote/src/libraries/core/input/WiiMote.cc	2013-12-02 14:49:14 UTC (rev 9853)
@@ -2,7 +2,7 @@
 #include "core/CoreIncludes.h"
 //#include "core/command/ConsoleCommand.h"
 #include <wiicpp/wiicpp/wiicpp.h>
-#include <command/CommandExecutor.h>
+#include "core/command/CommandExecutor.h"
 
 
 namespace orxonox
@@ -21,7 +21,7 @@
 			CWiimote::EventTypes e = p->GetEvent();
 			if(p->Buttons.isPressed(CButtons::BUTTON_A))
 				{
-					CE->execute("fire 0", 0, 0);
+					CommandExecutor::execute("fire 0", 0, 0);
 				}
 			Orientation o;
 			p->SetMotionSensingMode(CWiimote::ON);
@@ -58,7 +58,7 @@
 		lastOrientation.yaw = 0;
 		lastOrientation.roll = 0;
 		lastOrientation.pitch = 0;
-		CE = &(CommandExecutor::getInstance());
 
+
 	}
 }

Modified: code/branches/wiimote/src/libraries/core/input/WiiMote.h
===================================================================
--- code/branches/wiimote/src/libraries/core/input/WiiMote.h	2013-12-02 14:42:24 UTC (rev 9852)
+++ code/branches/wiimote/src/libraries/core/input/WiiMote.h	2013-12-02 14:49:14 UTC (rev 9853)
@@ -8,8 +8,6 @@
 
 namespace orxonox
 {
-
-	class CommandExecutor;
 	struct Orientation
     {
     	float roll, pitch, yaw;
@@ -41,6 +39,5 @@
 	         void test(int x, int y);
 	         CWiimote * p;
 	         CWii * PWii; //parent "wii" the wiimote is registered to
-	         CommandExecutor * CE;
 	};
 };