Fix gun angle and mobile colorspace

Author: CADIndie

common/src/main/java/org/vivecraft/client_vr/provider/openxr/MCOpenXR.java

@@ -3,8 +3,10 @@
 import com.google.common.collect.HashBiMap;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
+import net.minecraft.util.Mth;
 import net.minecraft.util.profiling.Profiler;
 import org.joml.Matrix4f;
+import org.joml.Matrix4fc;
 import org.joml.Vector2f;
 import org.joml.Vector3f;
 import org.lwjgl.PointerBuffer;
@@ -28,6 +30,7 @@
 import org.vivecraft.client_vr.provider.openxr.control.ControllerMapping;
 import org.vivecraft.client_vr.provider.openxr.control.XRInputAction;
 import org.vivecraft.client_vr.settings.VRSettings;
+import org.vivecraft.common.utils.MathUtils;
 import oshi.util.tuples.Pair;
 
 import java.io.FileNotFoundException;
@@ -318,6 +321,22 @@ private void updatePose() {
                 }
             }
 
+            if(this.controllerTracking[RIGHT_CONTROLLER]) {
+                Matrix4fc tip = this.controllerRotation[RIGHT_CONTROLLER];
+                Matrix4fc hand = this.handRotation[RIGHT_CONTROLLER];
+
+                Vector3f tipVec = tip.transformDirection(MathUtils.BACK, new Vector3f());
+                Vector3f handVec = hand.transformDirection(MathUtils.BACK, new Vector3f());
+
+                float dot = Math.abs(tipVec.dot(handVec));
+
+                float angleRad = (float) Math.acos(dot);
+                float angleDeg = Mth.RAD_TO_DEG * angleRad;
+
+                this.gunStyle = angleDeg > 10.0F;
+                this.gunAngle = angleDeg;
+            }
+
             this.updateAim();
         }
     }
@@ -881,20 +900,26 @@ private void initializeOpenXRSwapChain() {
             error = XR10.xrEnumerateSwapchainFormats(this.session, intBuf, swapchainFormats);
             logError(error, "xrEnumerateSwapchainFormats", "get formats");
 
-            long[] desiredSwapchainFormats = {
-                // SRGB formats
-                GL21.GL_SRGB8_ALPHA8,
-                GL21.GL_SRGB8,
-                // others
-                GL11.GL_RGB10_A2,
-                GL30.GL_RGBA16F,
-                GL30.GL_RGB16F,
-
-                // The two below should only be used as a fallback, as they are linear color formats without enough bits for color
-                // depth, thus leading to banding.
-                GL11.GL_RGBA8,
-                GL31.GL_RGBA8_SNORM,
-            };
+            long[] desiredSwapchainFormats;
+            if (this.device.getClass() == DeviceCompat.Desktop.class) {
+                desiredSwapchainFormats = new long[] {
+                    // SRGB formats
+                    GL21.GL_SRGB8_ALPHA8,
+                    GL21.GL_SRGB8,
+                    // others
+                    GL11.GL_RGB10_A2,
+                    GL30.GL_RGBA16F,
+                    GL30.GL_RGB16F,
+
+                    // The two below should only be used as a fallback, as they are linear color formats without enough bits for color
+                    // depth, thus leading to banding.
+                    GL11.GL_RGBA8,
+                    GL31.GL_RGBA8_SNORM
+                };
+            } else {
+                // Mobile runtimes tend to over-correct SRGB for some reason
+                desiredSwapchainFormats = new long[] {GL11.GL_RGBA8};
+            }
 
             // Choose format
             long chosenFormat = 0;
@@ -1181,17 +1206,22 @@ private void loadBindings() {
                                 VRSettings.LOGGER.warn("Input action '{}' not found", "/actions/" + set.getKey() + "/in/" + action.action());
                                 continue;
                             }
-                            long handle = this.mappedBindings.get(new ActionBind(inputAction.actionSet, source.path()));
-                            ActionType buttonType = ControllerMapping.getMapping(headsetPath).get(source.path());
 
+                            Long handle = this.mappedBindings.get(new ActionBind(inputAction.actionSet, source.path()));
+                            if (handle == null) {
+                                VRSettings.LOGGER.error("Cannot find button for path {}, are you sure this is the correct path?", source.path());
+                                continue;
+                            }
+
+                            ActionType buttonType = ControllerMapping.getMapping(headsetPath).get(source.path());
                             inputAction.addHandle(
                                 headsetPath,
                                 handle,
                                 source.path().contains("/left/") ? ControllerType.LEFT : ControllerType.RIGHT,
                                 buttonType
                             );
-                            inputAction.setType(action.type());
 
+                            inputAction.setType(action.type());
                             if (inputAction.getHandle(headsetPath).isEmpty() || handle == 0L) {
                                 VRSettings.LOGGER.error("Handle for '{}'/'{}' is null", "/actions/" + set.getKey() + "/in/" + action.action(), source.path());
                                 continue;
@@ -1202,8 +1232,6 @@ private void loadBindings() {
                                 new XrAction(handle, new XrActionSet(this.actionSetHandles.get(inputAction.actionSet), this.instance)),
                                 getPath(source.path())
                             ));
-
-                            VRSettings.LOGGER.info("Mapped action '{}' to button '{}'", this.getInputActionByName("/actions/" + set.getKey() + "/in/" + action.action()).name, source.path());
                         }
                     }