Fixed Prograde & Retrograde from snapping during timewarp IF there is any current movement

linuxgurugamer · linuxgurugamer · commit 33ea7a184cbb · 2021-07-27T22:13:16.000-04:00
Added Radial out and Radial in
 Renamed DLL for CKAN compatibility
 Added AssemblyFileVersion
 Updated version file for 1.12
diff --git a/Changelog.txt b/Changelog.txt
@@ -23,4 +23,11 @@ Changelog
 1.9.1.4
 	Thanks to user @Tacombel for this
 		Spanish translation
-	Added support for Retrograde
+	Added support for Retrograde
+
+1.9.1.5
+	Fixed Prograde & Retrograde from snapping during timewarp IF there is any current movement
+	Added Radial out and Radial in
+	Renamed DLL for CKAN compatibility
+	Added AssemblyFileVersion
+	Updated version file for 1.12
diff --git a/GameData/PersistentRotation/PersistentRotationUpgraded.version b/GameData/PersistentRotation/PersistentRotationUpgraded.version
@@ -11,21 +11,16 @@
     "MAJOR": 1,
     "MINOR": 9,
     "PATCH": 1,
-    "BUILD": 4
+    "BUILD": 5
   },
   "KSP_VERSION": {
     "MAJOR": 1,
-    "MINOR": 9,
-    "PATCH": 1
+    "MINOR": 12,
+    "PATCH": 0
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
     "MINOR": 8,
     "PATCH": 0
-  },
-  "KSP_VERSION_MAX": {
-    "MAJOR": 1,
-    "MINOR": 11,
-    "PATCH": 99
   }
 }
diff --git a/GameData/PersistentRotation/Plugins/PersistentRotation.dll b/GameData/PersistentRotation/Plugins/PersistentRotation.dll
diff --git a/GameData/PersistentRotation/Plugins/PersistentRotation.pdb b/GameData/PersistentRotation/Plugins/PersistentRotation.pdb
diff --git a/GameData/PersistentRotation/Plugins/PersistentRotationUpgraded.dll b/GameData/PersistentRotation/Plugins/PersistentRotationUpgraded.dll
diff --git a/GameData/PersistentRotation/Plugins/PersistentRotationUpgraded.pdb b/GameData/PersistentRotation/Plugins/PersistentRotationUpgraded.pdb
diff --git a/PersistentRotationUpgraded.version b/PersistentRotationUpgraded.version
@@ -11,21 +11,16 @@
     "MAJOR": 1,
     "MINOR": 9,
     "PATCH": 1,
-    "BUILD": 4
+    "BUILD": 5
   },
   "KSP_VERSION": {
     "MAJOR": 1,
-    "MINOR": 9,
-    "PATCH": 1
+    "MINOR": 12,
+    "PATCH": 0
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
     "MINOR": 8,
     "PATCH": 0
-  },
-  "KSP_VERSION_MAX": {
-    "MAJOR": 1,
-    "MINOR": 11,
-    "PATCH": 99
   }
 }
diff --git a/Source/AssemblyVersion.cs b/Source/AssemblyVersion.cs
@@ -5,4 +5,5 @@
   
  using System.Reflection;
 
- [assembly: AssemblyVersion("1.9.1.4")]
+ [assembly: AssemblyVersion("1.9.1.5")]
+ [assembly: AssemblyFileVersion("1.9.1.5")]
diff --git a/Source/AssemblyVersion.tt b/Source/AssemblyVersion.tt
@@ -98,3 +98,4 @@
  using System.Reflection;
 
  [assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")]
+ [assembly: AssemblyFileVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")]
diff --git a/Source/Interface.cs b/Source/Interface.cs
@@ -423,48 +423,6 @@ void OnClick()
             disabled = !disabled;
         }
 
-#if falase
-        void DeleteBlizzyToolbar()
-        {
-            if (ToolbarManager.ToolbarAvailable)
-            {
-                if (button != null)
-                {
-                    button.Destroy();
-                }
-            }
-        }
-        void CreateStockToolbar()
-        {
-            if (!stockButton)
-            {
-                stockButton = ApplicationLauncher.Instance.AddModApplication(
-                () =>
-                {
-                    disabled = !disabled;
-                },
-                () =>
-                {
-                    disabled = !disabled;
-                },
-                null,
-                null,
-                null,
-                null,
-                ApplicationLauncher.AppScenes.FLIGHT,
-                GameDatabase.Instance.GetTexture("PersistentRotation/Textures/texture", false)
-                );
-            }
-        }
-        void DeleteStockToolbar()
-        {
-            if (stockButton)
-            {
-                ApplicationLauncher.Instance.RemoveModApplication(stockButton);
-                stockButton = null;
-            }
-        }
-#endif
         void SaveGUI()
         {
             try
diff --git a/Source/Main.cs b/Source/Main.cs
@@ -116,7 +116,7 @@ private void FixedUpdate()
 
                         //Debug.Log("[PR] - currentStabilityMode: " + Enum.GetName(typeof(StabilityMode), currentStabilityMode));
 
-                        if (currentStabilityMode == StabilityMode.PROGRADE || currentStabilityMode == StabilityMode.RETROGRADE)
+                        if (v.storedAngularMomentum.magnitude < threshold && (currentStabilityMode == StabilityMode.PROGRADE || currentStabilityMode == StabilityMode.RETROGRADE))
                         {
                             var rotation = Quaternion.FromToRotation(
                                 (currentStabilityMode == StabilityMode.PROGRADE ? 1 : -1) *
@@ -126,7 +126,68 @@ private void FixedUpdate()
 
                             v.vessel.SetRotation(vessel.transform.rotation);
                         }
-                        else if (v.storedAngularMomentum.magnitude >= threshold)
+                        else
+#if false
+                        if (v.storedAngularMomentum.magnitude < threshold && (currentStabilityMode == StabilityMode.NORMAL || currentStabilityMode == StabilityMode.ANTI_NORMAL))
+                        {
+
+
+                            Vector3 burnV = vessel.obt_velocity;
+                            Vector3 yawnComponent = Vector3d.Exclude(vessel.GetTransform().forward, burnV);
+                            Vector3 crossp = Vector3.Cross(yawnComponent, vessel.GetTransform().right).normalized;
+                            double yawn = Vector3.SignedAngle(yawnComponent, vessel.GetTransform().up, crossp);
+                            if (yawn > 90)
+                            {
+                                yawn = yawn * -1f;
+                            }
+                            else if (yawn < -90)
+                            {
+                                yawn = yawn * -1f;
+                            }
+
+                            Vector3 pitchComponent = Vector3d.Exclude(vessel.GetTransform().right, burnV);
+                            crossp = Vector3.Cross(pitchComponent, vessel.GetTransform().forward).normalized;
+                            double pitch = Vector3.SignedAngle(pitchComponent, vessel.GetTransform().up, crossp);
+                            if (pitch > 90)
+                            {
+                                pitch = pitch * -1f;
+                            }
+                            else if (pitch < -90)
+                            {
+                                pitch = pitch * -1f;
+                            }
+
+                            var rotation = Quaternion.FromToRotation(
+                                crossp, vessel.obt_velocity.normalized);
+
+                            vessel.transform.Rotate(rotation.eulerAngles, Space.World);
+
+                            v.vessel.SetRotation(vessel.transform.rotation);
+
+#if false
+                            var rotation = Quaternion.FromToRotation(
+                                (currentStabilityMode == StabilityMode.NORMAL ? 1 : -1) *
+                               vessel.transform.up.normalized, vessel.obt_velocity.normalized);
+
+                            vessel.transform.Rotate(rotation.eulerAngles, Space.World);
+
+                            v.vessel.SetRotation(vessel.transform.rotation);
+#endif
+                        }
+                        else
+#endif
+                            if (v.storedAngularMomentum.magnitude < threshold && (currentStabilityMode == StabilityMode.RADIAL_OUT || currentStabilityMode == StabilityMode.RADIAN_IN))
+                        {
+                            var rotation = Quaternion.FromToRotation(
+                                (currentStabilityMode == StabilityMode.RADIAN_IN ? 1 : -1) *
+                                vessel.transform.up.normalized, FlightGlobals.ActiveVessel.upAxis);
+
+                            vessel.transform.Rotate(rotation.eulerAngles, Space.World);
+
+                            v.vessel.SetRotation(vessel.transform.rotation);
+                        }
+                        else
+                        if (v.storedAngularMomentum.magnitude >= threshold)
                         {
                             if (currentStabilityMode != StabilityMode.AUTOPILOT)
                             {
@@ -242,6 +303,7 @@ private void FixedUpdate()
 
             data.PRVessels.RemoveAll(v => v.processed == false);
         }
+
         private void OnDestroy()
         {
             instance = null;
@@ -444,7 +506,11 @@ private enum StabilityMode
             RELATIVE,
             AUTOPILOT, //When MechJeb controls the vessel, this will be removed when MechJeb waits to enter warp until momentum is zero.
             PROGRADE,
-            RETROGRADE
+            RETROGRADE,
+            NORMAL,
+            ANTI_NORMAL,
+            RADIAL_OUT,
+            RADIAN_IN
         }
         private StabilityMode GetStabilityMode(Vessel vessel)
         {
@@ -459,15 +525,21 @@ private StabilityMode GetStabilityMode(Vessel vessel)
             else if (vessel.ActionGroups[KSPActionGroup.SAS] && data.FindPRVessel(vessel).mjMode == MechJebWrapper.SATarget.OFF && MechJebWrapper.GetMode(vessel) == MechJebWrapper.SATarget.OFF)
             {
                 /* Only stock SAS is enabled */
+                switch (vessel.Autopilot.Mode)
+                {
+                    case VesselAutopilot.AutopilotMode.StabilityAssist: return StabilityMode.RELATIVE;
+                    case VesselAutopilot.AutopilotMode.Prograde: return StabilityMode.PROGRADE;
+                    case VesselAutopilot.AutopilotMode.Retrograde: return StabilityMode.RETROGRADE;
 
-                if (vessel.Autopilot.Mode == VesselAutopilot.AutopilotMode.StabilityAssist)
-                    return StabilityMode.RELATIVE;
-                else if (vessel.Autopilot.Mode == VesselAutopilot.AutopilotMode.Prograde)
-                    return StabilityMode.PROGRADE;
-                else if (vessel.Autopilot.Mode == VesselAutopilot.AutopilotMode.Retrograde)
-                    return StabilityMode.RETROGRADE;
-                else
-                    return StabilityMode.ABSOLUTE;
+#if false
+                    case VesselAutopilot.AutopilotMode.Normal: return StabilityMode.NORMAL;
+                    case VesselAutopilot.AutopilotMode.Antinormal: return StabilityMode.ANTI_NORMAL;
+#endif
+                    case VesselAutopilot.AutopilotMode.RadialOut: return StabilityMode.RADIAL_OUT;
+                    case VesselAutopilot.AutopilotMode.RadialIn: return StabilityMode.RADIAN_IN;
+
+                }
+                return StabilityMode.ABSOLUTE;
             }
             else if (!vessel.ActionGroups[KSPActionGroup.SAS] && (data.FindPRVessel(vessel).mjMode != MechJebWrapper.SATarget.OFF || MechJebWrapper.GetMode(vessel) != MechJebWrapper.SATarget.OFF))
                 return StabilityMode.ABSOLUTE; /* Only SmartA.S.S. is enabled */
diff --git a/Source/PersistentRotation.csproj b/Source/PersistentRotation.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PersistentRotation</RootNamespace>
-    <AssemblyName>PersistentRotation</AssemblyName>
+    <AssemblyName>PersistentRotationUpgraded</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -42,9 +42,6 @@
     <Reference Include="ClickThroughBlocker">
       <HintPath>$(KSPDIR)\GameData\000_ClickThroughBlocker\Plugins\ClickThroughBlocker.dll</HintPath>
     </Reference>
-    <Reference Include="KSP_Log">
-      <HintPath>$(KSPDIR)\GameData\SpaceTuxLibrary\Plugins\KSP_Log.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="ToolbarControl">
       <HintPath>$(KSPDIR)\GameData\001_ToolbarControl\Plugins\ToolbarControl.dll</HintPath>
@@ -103,4 +100,4 @@ if $(ConfigurationName) == Release (
   <PropertyGroup>
     <PreBuildEvent>"$(DevEnvDir)\texttransform.exe" "$(ProjectDir)AssemblyVersion.tt"</PreBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/buildRelease.bat b/buildRelease.bat
@@ -36,7 +36,6 @@ rem Copy files to GameData locations
 
 copy /Y "%1%2" "%GAMEDATA%\%GAMEDIR%\Plugins"
 copy /Y %VERSIONFILE% %GAMEDATA%\%GAMEDIR%
-copy /Y ..\MiniAVC.dll %GAMEDATA%\%GAMEDIR%
 
 if "%LICENSE%" NEQ "" copy /y  %LICENSE% %GAMEDATA%\%GAMEDIR%
 if "%README%" NEQ "" copy /Y %README% %GAMEDATA%\%GAMEDIR%

Original file line number	Diff line number	Diff line change
`@@ -98,3 +98,4 @@`
`98`	`98`	`using System.Reflection;`
`99`	`99`
`100`	`100`	`[assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")]`
	`101`	`+ [assembly: AssemblyFileVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")]`