Fix free look not working with controllers

Waterdish · Nov 24, 2024 · 821dd70 · 821dd70
1 parent ef7780f
commit 821dd70
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Android/app/src/main/java/com/dishii/mm/MainActivity.java b/Android/app/src/main/java/com/dishii/mm/MainActivity.java
@@ -200,6 +200,7 @@ private boolean isExternalStorageWritable() {
 
 
     public native void attachController();
+    public native void detachController();
     // Native method for setting button state
     public native void setButton(int button, boolean value);
     public native void setCameraState(int axis, float value);
@@ -290,14 +291,19 @@ private void setupControllerOverlay() {
     private void setupToggleButton(Button button, ViewGroup uiGroup){
         boolean isHidden = preferences.getBoolean("controlsVisible", false); // Default to 'false' (visible)
         uiGroup.setVisibility(isHidden ? View.INVISIBLE : View.VISIBLE); // Set the initial visibility based on the saved state
+        /*if(isHidden){
+            detachController();
+        }*/
         button.setOnClickListener(new View.OnClickListener() {
             boolean isHidden = false;
             @Override
             public void onClick(View v) {
                 if (isHidden) {
                     uiGroup.setVisibility(View.VISIBLE); // Show UI elements
+                    //attachController();
                 } else {
                     uiGroup.setVisibility(View.INVISIBLE); // Hide UI elements
+                    //detachController();
                 }
                 preferences.edit().putBoolean("controlsVisible", !isHidden).apply();
                 isHidden = !isHidden; // Toggle state

diff --git a/libultraship b/libultraship
diff --git a/mm/2s2h/Enhancements/Camera/FreeLook.cpp b/mm/2s2h/Enhancements/Camera/FreeLook.cpp
@@ -101,8 +101,8 @@ bool Camera_FreeLook(Camera* camera) {
 
 #ifdef __ANDROID__
     if(Ship::Mobile::IsUsingTouchscreenControls()) {
-        yawDiff = -Ship::Mobile::GetCameraYaw()*10.0f;
-        pitchDiff = Ship::Mobile::GetCameraPitch()*10.0f;
+        yawDiff += -Ship::Mobile::GetCameraYaw()*10.0f;
+        pitchDiff += Ship::Mobile::GetCameraPitch()*10.0f;
     }
 #endif