From da2695fd3c55b735c48f11479be20614af3acdac Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Fri, 17 Nov 2017 14:44:25 +0000
Subject: [PATCH] Added missing gamepad receivers. refs 3079
---
.../generator/executable/MainGenerator.java | 26 +++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/MainGenerator.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/MainGenerator.java
index 925b6555..dc85a971 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/MainGenerator.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/generator/executable/MainGenerator.java
@@ -38,9 +38,15 @@ import org.fortiss.af3.platform.raspberry.model.gamepad.Button1;
import org.fortiss.af3.platform.raspberry.model.gamepad.Button2;
import org.fortiss.af3.platform.raspberry.model.gamepad.Button3;
import org.fortiss.af3.platform.raspberry.model.gamepad.Button4;
+import org.fortiss.af3.platform.raspberry.model.gamepad.ButtonL1;
+import org.fortiss.af3.platform.raspberry.model.gamepad.ButtonL2;
+import org.fortiss.af3.platform.raspberry.model.gamepad.ButtonR1;
+import org.fortiss.af3.platform.raspberry.model.gamepad.ButtonR2;
import org.fortiss.af3.platform.raspberry.model.gamepad.GamepadReceiverBase;
import org.fortiss.af3.platform.raspberry.model.gamepad.Left_StickX_Position;
import org.fortiss.af3.platform.raspberry.model.gamepad.Left_StickY_Position;
+import org.fortiss.af3.platform.raspberry.model.gamepad.Right_StickX_Position;
+import org.fortiss.af3.platform.raspberry.model.gamepad.Right_StickY_Position;
import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
/**
@@ -172,6 +178,26 @@ class MainGenerator {
if(receiver instanceof Button4) {
return gamepadReadCode("gamepad_get_button_state", "GAMEPAD_BUTTON_4", inport);
}
+ if(receiver instanceof ButtonL1) {
+ return gamepadReadCode("gamepad_get_button_state", "GAMEPAD_BUTTON_L1", inport);
+ }
+ if(receiver instanceof ButtonL2) {
+ return gamepadReadCode("gamepad_get_button_state", "GAMEPAD_BUTTON_L2", inport);
+ }
+ if(receiver instanceof ButtonR1) {
+ return gamepadReadCode("gamepad_get_button_state", "GAMEPAD_BUTTON_R1", inport);
+ }
+ if(receiver instanceof ButtonR2) {
+ return gamepadReadCode("gamepad_get_button_state", "GAMEPAD_BUTTON_R2", inport);
+ }
+ if(receiver instanceof Right_StickX_Position) {
+ return gamepadReadCode("gamepad_get_axis_position",
+ "GAMEPAD_AXIS_RIGHT_STICK_HORIZONTAL", inport);
+ }
+ if(receiver instanceof Right_StickY_Position) {
+ return gamepadReadCode("gamepad_get_axis_position",
+ "GAMEPAD_AXIS_RIGHT_STICK_VERTICAL", inport);
+ }
if(receiver instanceof Left_StickX_Position) {
return gamepadReadCode("gamepad_get_axis_position",
"GAMEPAD_AXIS_LEFT_STICK_HORIZONTAL", inport);
--
GitLab