add negative apoapsis hyperbolic orbits

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
MuMech · Jul 17, 2017 · fa4d544 · fa4d544
1 parent 03a62a1
commit fa4d544
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/MechJeb2/MechJebModuleAscentPEG.cs b/MechJeb2/MechJebModuleAscentPEG.cs
@@ -20,7 +20,7 @@ public class MechJebModuleAscentPEG : MechJebModuleAscentBase
         [Persistent(pass = (int)(Pass.Type))]
         public EditableDoubleMult pitchEndTime = new EditableDoubleMult(55);
         [Persistent(pass = (int)(Pass.Global))]
-        public EditableDoubleMult desiredApoapsis = new EditableDoubleMult(-1, 1000);
+        public EditableDoubleMult desiredApoapsis = new EditableDoubleMult(0, 1000);
         [Persistent(pass = (int)(Pass.Type))]
         public EditableDoubleMult terminalGuidanceSecs = new EditableDoubleMult(10);
         [Persistent(pass = (int)(Pass.Type))]
@@ -338,10 +338,10 @@ void UpdateStageStats()
         }
 
         private double smaT() {
-            if ( desiredApoapsis > autopilot.desiredOrbitAltitude )
-                return (autopilot.desiredOrbitAltitude + 2 * mainBody.Radius + desiredApoapsis) / 2;
-            else
+            if ( desiredApoapsis >= 0 && desiredApoapsis < autopilot.desiredOrbitAltitude )
                 return autopilot.desiredOrbitAltitude + mainBody.Radius;
+            else
+                return (autopilot.desiredOrbitAltitude + 2 * mainBody.Radius + desiredApoapsis) / 2;
         }
 
         private void UpdateRocketStats() {

diff --git a/MechJeb2/MechJebModuleAscentPEGMenu.cs b/MechJeb2/MechJebModuleAscentPEGMenu.cs
@@ -37,7 +37,7 @@ protected override void WindowGUI(int windowID)
 
             GuiUtils.SimpleTextBox("Target Periapsis:", autopilot.desiredOrbitAltitude, "km");
             GuiUtils.SimpleTextBox("Target Apoapsis:", path.desiredApoapsis, "km");
-            if ( path.desiredApoapsis < autopilot.desiredOrbitAltitude )
+            if ( path.desiredApoapsis >= 0 && path.desiredApoapsis < autopilot.desiredOrbitAltitude )
             {
                 GUIStyle s = new GUIStyle(GUI.skin.label);
                 s.normal.textColor = Color.yellow;