Changeset 314 in flair-src for trunk/demos/MixedReality

Timestamp:

Mar 21, 2019, 2:04:45 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

maj joystick

Location:

trunk/demos/MixedReality

Files:

• real/uav/src/CircleFollower.cpp (modified) (1 diff)
• virtual/uav/src/App.cpp (modified) (1 diff)

trunk/demos/MixedReality/real/uav/src/CircleFollower.cpp

@@ -222 +222 @@
 void CircleFollower::ExtraCheckJoystick(void) {
     //R1 and Circle
-    if(GetJoystick()->IsButtonPressed(9) && GetJoystick()->IsButtonPressed(4) && (behaviourMode!=BehaviourMode_t::Circle)) {
+    if(GetTargetController()->IsButtonPressed(9) && GetTargetController()->IsButtonPressed(4) && (behaviourMode!=BehaviourMode_t::Circle)) {
         StartCircle();
     }
 
     //R1 and Cross
-    if(GetJoystick()->IsButtonPressed(9) && GetJoystick()->IsButtonPressed(5) && (behaviourMode==BehaviourMode_t::Circle)) {
+    if(GetTargetController()->IsButtonPressed(9) && GetTargetController()->IsButtonPressed(5) && (behaviourMode==BehaviourMode_t::Circle)) {
         StopCircle();
     }
     
     //R1 and Square
-    if(GetJoystick()->IsButtonPressed(9) && GetJoystick()->IsButtonPressed(2) && (behaviourMode==BehaviourMode_t::Default)) {
+    if(GetTargetController()->IsButtonPressed(9) && GetTargetController()->IsButtonPressed(2) && (behaviourMode==BehaviourMode_t::Default)) {
         VrpnPositionHold();
     }

trunk/demos/MixedReality/virtual/uav/src/App.cpp

@@ -169 +169 @@
 void App::ExtraCheckJoystick(void) {
     //R1 and Square
-    if(GetJoystick()->IsButtonPressed(9) && GetJoystick()->IsButtonPressed(2) && (behaviourMode==BehaviourMode_t::Default)) {
+    if(GetTargetController()->IsButtonPressed(9) && GetTargetController()->IsButtonPressed(2) && (behaviourMode==BehaviourMode_t::Default)) {
         VrpnPositionHold();
     }