Combine sixaxis input with game input

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 1.0.2
+
+- Combine sixaxis input with existing game input.
+
 ## 1.0.1
 
 - Remove log interceptor; allow crash logs to function normally.

src/OrientationInjector.cs

@@ -48,7 +48,7 @@ static Vector3 ApplySixAxisRotation(Vector3 vector)
         {
             // TODO: Merge our input with existing input
             var rotation = new Vector3(InputHandler.RZ, InputHandler.RX, -InputHandler.RY);
-            return rotation;
+            return VectorUtils.Average(rotation, vector);
         }
     }
 }

src/SixAxisPlugin.cs

@@ -5,7 +5,7 @@
 namespace RoboPhredDev.Shipbreaker.SixAxis
 {
 
-    [BepInPlugin("net.robophreddev.shipbreaker.SixAxis", "Six Axis Joystick support for Shipbreaker", "1.0.1.0")]
+    [BepInPlugin("net.robophreddev.shipbreaker.SixAxis", "Six Axis Joystick support for Shipbreaker", "1.0.2.0")]
     public class SixAxisPlugin : BaseUnityPlugin
     {
         public static SixAxisPlugin Instance;

src/ThrustInjector.cs

@@ -50,7 +50,7 @@ static Vector3 ApplySixAxisTranslation(Vector3 vector)
         {
             // var translation = new Vector3(-InputHandler.X, -InputHandler.Z, InputHandler.Y);
             var translation = new Vector3(InputHandler.X, -InputHandler.Z, -InputHandler.Y);
-            return translation;
+            return VectorUtils.Average(translation, vector);
         }
     }
 }

src/VectorUtils.cs

@@ -0,0 +1,18 @@
+
+using UnityEngine;
+
+namespace RoboPhredDev.Shipbreaker.SixAxis
+{
+    static class VectorUtils
+    {
+        public static Vector3 Average(Vector3 a, Vector3 b)
+        {
+            return new Vector3
+            {
+                x = (a.x + b.x) / 2.0f,
+                y = (a.y + b.y) / 2.0f,
+                z = (a.z + b.z) / 2.0f
+            };
+        }
+    }
+}