1.2.0

- Added plane mode
- Fixed a bug where the SAS would keep going toward the fly by wire direction after switching back to the stock stability assist mode.
- Put all icons in a single texture atlas

Author: gotmachine

FlyByWireSASMode.cs

@@ -16,29 +16,48 @@ namespace FlyByWireSASMode
     [DefaultExecutionOrder(1)] // our LateUpdate() need to run after VesselAutopilotUI.LateUpdate()
     internal class FlyByWireSASMode : MonoBehaviour
     {
+        private const string TEX_PATH = "FlyByWireSASMode/textures";
+        // singleton accessor
         internal static FlyByWireSASMode instance;
 
+        // internal state
         private static bool init;
+
+        // sprites
         private static Sprite flyByWireSprite;
+        private static Sprite flyByWirePlaneSprite;
         private static Sprite parallelPosSprite;
         private static Sprite parallelNegSprite;
+        
+        // config
         private static AutopilotMode requiredSASMode = AutopilotMode.Maneuver;
-        private static float inputSensitivity = 1f;
+        internal static float inputSensitivity = 1f;
 
+        // internal state
         private bool started;
 
+        // SAS UI buttons references
         private UIStateToggleButton stabilityAssistButton;
         private UIStateToggleButton flyByWireButton;
+        private UIStateToggleButton flyByWirePlaneButton;
         private UIStateToggleButton parallelPosButton;
         private UIStateToggleButton parallelNegButton;
 
+        // stock navball reference
         internal NavBall navBall;
+
+        // custom navball markers
         private GameObject navBallMarker;
         private GameObject navBallArrow;
 
+        // known active vessel (for polling purposes)
         private Vessel activeVessel;
+
+        // per vessel direction and state tracking
         private VesselState activeVesselState;
         private List<VesselState> nonActiveVesselStates = new List<VesselState>();
+
+        // known state for polling based state change detection
         private bool isModeAvailableOnActiveVessel;
 
         private void Awake()
@@ -68,21 +87,22 @@ private void Awake()
                 }
             }
 
-            flyByWireSprite = LoadSprite("FlyByWireSASMode/FlyByWireMarker");
-            parallelPosSprite = LoadSprite("FlyByWireSASMode/ParallelPosMarker");
-            parallelNegSprite = LoadSprite("FlyByWireSASMode/ParallelNegMarker");
-        }
-
-        private static Sprite LoadSprite(string path)
-        {
-            Texture2D tex = GameDatabase.Instance.GetTexture(path, false);
+            Texture2D tex = GameDatabase.Instance.GetTexture(TEX_PATH, false);
             if (tex == null)
             {
-                Debug.LogError($"[FlyByWireSASMode] Unable to get 'GameData/{path}.png' texture, make sure the plugin is installed in the right folder.");
-                return null;
+                Debug.LogError($"[FlyByWireSASMode] Unable to get 'GameData/{TEX_PATH}.png' texture, make sure the plugin is installed in the right folder.");
+                return;
             }
 
-            return Sprite.Create(tex, new Rect(0f, 0f, tex.width, tex.height), new Vector2(0.5f, 0.5f));
+            CreateSprite(tex, 0f, 0f, 64f, 64f, out flyByWireSprite);
+            CreateSprite(tex, 0f, 64f, 64f, 64f, out flyByWirePlaneSprite);
+            CreateSprite(tex, 0f, 128f, 34f, 34f, out parallelNegSprite);
+            CreateSprite(tex, 34f, 128f, 34f, 34f, out parallelPosSprite);
+        }
+
+        private static void CreateSprite(Texture2D tex, float xOffset, float yOffset, float xSize, float ySize, out Sprite sprite)
+        {
+            sprite = Sprite.Create(tex, new Rect(xOffset, tex.height - yOffset - ySize, xSize, ySize), new Vector2(0.5f, 0.5f));
         }
 
         private IEnumerator Start()
@@ -99,6 +119,7 @@ private IEnumerator Start()
                 button.onClick.AddListener(DeactivateFromUI);
 
             flyByWireButton = CopySASButton(autopilotUI, AutopilotMode.Maneuver, "FlyByWire", "Fly by wire", 7f, 25f, flyByWireSprite, ActivateFlyByWireFromUI);
+            flyByWirePlaneButton = CopySASButton(autopilotUI, AutopilotMode.StabilityAssist, "FlyByWirePlane", "Fly by wire\n(plane mode)", 7f, 25f, flyByWirePlaneSprite, ActivateFlyByWirePlaneFromUI);
             parallelPosButton = CopySASButton(autopilotUI, AutopilotMode.Target, "Parallel", "Parallel", 5f, -25f, parallelPosSprite, ActivateParallelPosFromUI);
             parallelNegButton = CopySASButton(autopilotUI, AutopilotMode.AntiTarget, "AntiParallel", "AntiParallel", 5f, -25f, parallelNegSprite, ActivateParallelNegFromUI);
 
@@ -168,6 +189,21 @@ private void ActivateFlyByWireFromUI()
             SetUIMode(CustomSASMode.FlyByWire);
         }
 
+        private void ActivateFlyByWirePlaneFromUI()
+        {
+            if (activeVesselState != null)
+            {
+                activeVesselState.sasMode = CustomSASMode.FlyByWirePlaneMode;
+                activeVesselState.ResetDirection();
+            }
+            else
+            {
+                activeVesselState = new VesselState(FlightGlobals.ActiveVessel, CustomSASMode.FlyByWirePlaneMode);
+            }
+
+            SetUIMode(CustomSASMode.FlyByWirePlaneMode);
+        }
+
         private void ActivateParallelPosFromUI()
         {
             if (activeVesselState != null)
@@ -204,12 +240,14 @@ private void SetUIMode(CustomSASMode mode)
             if (mode == CustomSASMode.Stock)
             {
                 flyByWireButton.SetState(false);
+                flyByWirePlaneButton.SetState(false);
                 parallelPosButton.SetState(false);
                 parallelNegButton.SetState(false);
             }
             else
             {
                 flyByWireButton.SetState(mode == CustomSASMode.FlyByWire);
+                flyByWirePlaneButton.SetState(mode == CustomSASMode.FlyByWirePlaneMode);
                 parallelPosButton.SetState(mode == CustomSASMode.ParallelPos);
                 parallelNegButton.SetState(mode == CustomSASMode.ParallelNeg);
 
@@ -265,6 +303,7 @@ private void LateUpdate()
             {
                 isModeAvailableOnActiveVessel = isModeAvailable;
                 flyByWireButton.gameObject.SetActive(isModeAvailable);
+                flyByWirePlaneButton.gameObject.SetActive(isModeAvailable);
                 parallelPosButton.gameObject.SetActive(isModeAvailable);
                 parallelNegButton.gameObject.SetActive(isModeAvailable);
             }
@@ -305,7 +344,7 @@ private void LateUpdate()
             // continously disable the stability assist button
             stabilityAssistButton.SetState(false);
 
-            if (activeVesselState.sasMode == CustomSASMode.FlyByWire)
+            if (activeVesselState.sasMode == CustomSASMode.FlyByWire || activeVesselState.sasMode == CustomSASMode.FlyByWirePlaneMode)
             {            
                 // set marker position on navball
                 Vector3 markerLocalPos = navBall.attitudeGymbal * (activeVesselState.direction * navBall.VectorUnitScale);

FlyByWireSASMode.csproj

@@ -85,6 +85,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FlyByWireSASMode.cs" />
+    <Compile Include="Lib.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="VesselState.cs" />
   </ItemGroup>

GameData/FlyByWireSASMode/FlyByWireMarker.png

@@ -2,7 +2,7 @@
   "NAME": "FlyByWireSASMode",
   "URL": "https://raw.githubusercontent.com/gotmachine/FlyByWireSASMode/master/GameData/FlyByWireSASMode/FlyByWireSASMode.version",
   "DOWNLOAD": "https://github.com/gotmachine/FlyByWireSASMode/releases",
-  "VERSION": {"MAJOR": 1, "MINOR": 1, "PATCH": 0, "BUILD": 0},
+  "VERSION": {"MAJOR": 1, "MINOR": 2, "PATCH": 0, "BUILD": 0},
   "KSP_VERSION": {"MAJOR": 1, "MINOR": 12, "PATCH": 5},
   "KSP_VERSION_MIN": {"MAJOR": 1, "MINOR": 12, "PATCH": 3},
   "KSP_VERSION_MAX": {"MAJOR": 1, "MINOR": 12, "PATCH": 5}

GameData/FlyByWireSASMode/FlyByWireSASMode.version

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace FlyByWireSASMode
+{
+    public static class Lib
+    {
+        /// <summary>
+        /// Return a quaternion describing a rotation from a normalized direction vector to another.
+        /// </summary>
+        /// <param name="fromV">The normalized starting vector</param>
+        /// <param name="toV">The normalized end vector</param>
+        public static QuaternionD QuaternionDFromToRotation(Vector3d fromV, Vector3d toV)
+        {
+            double dot = Vector3d.Dot(fromV, toV);
+
+            if (dot >= 1.0)
+                return QuaternionD.identity;
+
+            if (dot <= -1.0)
+            {
+                Vector3d axis = Vector3d.Cross(Vector3d.right, fromV);
+                if (axis.sqrMagnitude == 0.0)
+                    axis = Vector3d.Cross(Vector3d.up, fromV);
+
+                return new QuaternionD(axis.x, axis.y, axis.z, 0.0);
+            }
+
+            double s = Math.Sqrt((1.0 + dot) * 2.0);
+            double rs = 1.0 / s;
+            Vector3d cross = Vector3d.Cross(fromV, toV);
+            return new QuaternionD(cross.x * rs, cross.y * rs, cross.z * rs, s * 0.5);
+        }
+
+        private const double halfDegToRad = Math.PI / 180.0 * 0.5;
+
+        /// <summary>
+        /// Returns a rotation that rotates z degrees around the z axis,
+        /// x degrees around the x axis, and y degrees around the y axis,
+        /// applied in that order.
+        /// </summary>
+        public static QuaternionD QuaternionDFromEuler(double x, double y, double z)
+        {
+            double sz, cz, sx, cx, sy, cy;
+
+            double halfX = x * halfDegToRad;
+            sx = Math.Sin(halfX);
+            cx = Math.Cos(halfX);
+
+            double halfY = y * halfDegToRad;
+            sy = Math.Sin(halfY);
+            cy = Math.Cos(halfY);
+
+            double halfZ = z * halfDegToRad;
+            sz = Math.Sin(halfZ);
+            cz = Math.Cos(halfZ);
+
+            return new QuaternionD(
+                cy * sx * cz + sy * cx * sz,
+                sy * cx * cz - cy * sx * sz,
+                cy * cx * sz - sy * sx * cz,
+                cy * cx * cz + sy * sx * sz);
+        }
+    }
+}

GameData/FlyByWireSASMode/ParallelNegMarker.png

@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]