disable AndroidSensorJoyInput

Author: riccardobl

jme3-android-examples/src/main/java/jme3test/android/TestAndroidSensors.java

@@ -17,6 +17,7 @@
 import com.jme3.scene.Mesh;
 import com.jme3.scene.shape.Box;
 import com.jme3.scene.shape.Line;
+import com.jme3.system.AppSettings;
 import com.jme3.texture.Texture;
 import com.jme3.util.IntMap;
 
@@ -79,6 +80,12 @@ public class TestAndroidSensors extends SimpleApplication implements ActionListe
 
     // Make sure to set joystickEventsEnabled = true in MainActivity for Android
 
+    public static void configureSettings(AppSettings settings) {
+        settings.setUseJoysticks(true);
+        settings.setUseAndroidSensorJoystick(true);
+        settings.setVirtualJoystick(AppSettings.VIRTUAL_JOYSTICK_DISABLED);
+    }
+
     private float toDegrees(float rad) {
         return rad * FastMath.RAD_TO_DEG;
     }
@@ -311,4 +318,4 @@ public void onAnalog(String string, float value, float tpf) {
         }
 
     }
-}
+}

jme3-android/src/main/java/com/jme3/app/AndroidHarnessFragment.java

@@ -42,7 +42,7 @@
 import androidx.fragment.app.Fragment;
 import com.jme3.audio.AudioRenderer;
 import com.jme3.input.JoyInput;
-import com.jme3.input.android.AndroidSensorJoyInput;
+import com.jme3.input.android.AndroidJoyInput;
 import com.jme3.system.AppSettings;
 import com.jme3.system.SystemListener;
 import com.jme3.system.android.JmeAndroidSystem;
@@ -269,8 +269,8 @@ public void gainFocus() {
             }
 
             JoyInput joyInput = app.getContext() != null ? app.getContext().getJoyInput() : null;
-            if (joyInput instanceof AndroidSensorJoyInput) {
-                ((AndroidSensorJoyInput) joyInput).resumeSensors();
+            if (joyInput instanceof AndroidJoyInput) {
+                ((AndroidJoyInput) joyInput).resumeJoysticks();
             }
 
             app.gainFocus();
@@ -295,8 +295,8 @@ public void loseFocus() {
             }
 
             JoyInput joyInput = app.getContext() != null ? app.getContext().getJoyInput() : null;
-            if (joyInput instanceof AndroidSensorJoyInput) {
-                ((AndroidSensorJoyInput) joyInput).pauseSensors();
+            if (joyInput instanceof AndroidJoyInput) {
+                ((AndroidJoyInput) joyInput).pauseJoysticks();
             }
         }
     }

jme3-android/src/main/java/com/jme3/input/android/AndroidJoyInput.java

@@ -50,9 +50,8 @@
 import java.util.logging.Logger;
 
 /**
- * Main class that manages various joystick devices.  Joysticks can be many forms
- * including a simulated joystick to communicate the device orientation as well
- * as physical joysticks. <br>
+ * Main class that manages joystick devices. Joysticks can be physical gamepads,
+ * the on-screen virtual joystick, or an explicitly-enabled sensor joystick. <br>
  * This class manages all the joysticks and feeds the inputs from each back
  * to jME's InputManager.
  *
@@ -81,7 +80,6 @@
  */
 public class AndroidJoyInput implements JoyInput {
     private static final Logger logger = Logger.getLogger(AndroidJoyInput.class.getName());
-    public static boolean disableSensors = false;
 
     protected AndroidInputHandler inputHandler;
     protected List<Joystick> joystickList = new ArrayList<>();
@@ -96,16 +94,18 @@ public class AndroidJoyInput implements JoyInput {
     private boolean onDeviceJoystickRumble = false;
     private String virtualJoystickMode = AppSettings.VIRTUAL_JOYSTICK_AUTO_MINIMIZED;
     private boolean useJoysticks = true;
+    private boolean useAndroidSensorJoystick = false;
     private boolean physicalJoystickAvailable = false;
     private boolean keyboardSuppressedAutoJoystick = false;
     private VirtualJoystick virtualJoystick;
+    private GLSurfaceView view;
 
     public AndroidJoyInput(AndroidInputHandler inputHandler) {
         this.inputHandler = inputHandler;
-        sensorJoyInput = new AndroidSensorJoyInput(this);
     }
 
     public void setView(GLSurfaceView view) {
+        this.view = view;
         if (sensorJoyInput != null) {
             sensorJoyInput.setView(view);
         }
@@ -115,6 +115,7 @@ public void loadSettings(AppSettings settings) {
         onDeviceJoystickRumble = settings.isOnDeviceJoystickRumble();
         virtualJoystickMode = settings.getVirtualJoystickMode();
         useJoysticks = settings.useJoysticks();
+        useAndroidSensorJoystick = settings.useAndroidSensorJoystick();
     }
 
     boolean isOnDeviceJoystickRumble() {
@@ -150,7 +151,6 @@ public void resumeJoysticks() {
         if (sensorJoyInput != null) {
             sensorJoyInput.resumeSensors();
         }
-
     }
 
     @Override
@@ -166,12 +166,11 @@ public boolean isInitialized() {
     @Override
     public void destroy() {
         initialized = false;
-
         if (sensorJoyInput != null) {
             sensorJoyInput.destroy();
+            sensorJoyInput = null;
         }
-
-        setView(null);
+        view = null;
     }
 
     @Override
@@ -204,7 +203,11 @@ public Joystick[] loadJoysticks(InputManager inputManager) {
             logger.log(Level.INFO, "loading joysticks for {0}", this.getClass().getName());
         }
         joystickList.clear();
-        if (!disableSensors) {
+        if (useJoysticks && useAndroidSensorJoystick) {
+            if (sensorJoyInput == null) {
+                sensorJoyInput = new AndroidSensorJoyInput(this);
+                sensorJoyInput.setView(view);
+            }
             joystickList.add(sensorJoyInput.loadJoystick(joystickList.size(), inputManager));
         }
         physicalJoystickAvailable = false;

jme3-android/src/main/java/com/jme3/input/android/AndroidJoyInput14.java

@@ -90,7 +90,7 @@ public void destroy() {
 
     @Override
     public Joystick[] loadJoysticks(InputManager inputManager) {
-        // load the simulated joystick for device orientation
+        // load virtual joystick if enabled
         super.loadJoysticks(inputManager);
         // load physical gamepads/joysticks
         int beforePhysicalJoysticks = joystickList.size();