Version 0.14.1
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -39,7 +39,7 @@
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("0.13.*")]
+[assembly: AssemblyVersion("0.14.1.*")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
//[assembly: AssemblyDelaySign(false)]
--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -70,6 +70,7 @@
public static void Reset()
{
_instance.StopGUI();
+ _instance.Dispose();
_instance = null;
_initialized = false;
}
@@ -283,6 +284,18 @@
}
}
+ public Stage[] Stages
+ {
+ get;
+ protected set;
+ }
+
+ public Stage LastStage
+ {
+ get;
+ protected set;
+ }
+
protected IconState powerState
{
get
@@ -345,6 +358,14 @@
}
_UseToolbarManager.value = value;
+ }
+ }
+
+ protected virtual ApplicationLauncher.AppScenes appIconVisibleScenes
+ {
+ get
+ {
+ return ApplicationLauncher.AppScenes.FLIGHT;
}
}
@@ -428,7 +449,7 @@
}
}
- public void OnGUI()
+ public virtual void OnGUI()
{
if (Event.current.type == EventType.Repaint)
{
@@ -482,21 +503,14 @@
}
}
- public void Update()
+ public virtual void Update()
{
this.LoadBeforeUpdate();
if (this.vessel != null && this.vesselSimActive)
{
- double radius = this.vessel.Radius();
- SimManager.Gravity = this.vessel.mainBody.gravParameter /
- (radius * radius);
- SimManager.minSimTime = (long)(this.updatePeriod * 1000);
- SimManager.TryStartSimulation();
- }
- else if (!this.vesselSimActive)
- {
- SimManager.ClearResults();
+ Tools.PostDebugMessage(this, "Updating SimManager.");
+ this.UpdateSimManager();
}
if (!this.guiRunning)
@@ -533,7 +547,7 @@
this._updateTimer += Time.deltaTime;
}
- public void FixedUpdate()
+ public virtual void FixedUpdate()
{
bool newPowerState = this.powerAvailable;
@@ -720,6 +734,41 @@
this._factoryReset = GUILayout.Toggle(this._factoryReset, "Factory Reset");
}
+ protected void UpdateSimManager()
+ {
+ if (SimManager.ResultsReady())
+ {
+ Tools.PostDebugMessage(this, "VesselSimulator results ready, setting Stages.");
+
+ this.Stages = SimManager.Stages;
+
+ if (this.Stages != null)
+ {
+ this.LastStage = this.Stages.Last();
+ }
+
+ if (HighLogic.LoadedSceneIsEditor)
+ {
+ SimManager.Gravity = VOID_Data.KerbinGee;
+ }
+ else
+ {
+ double radius = this.vessel.Radius();
+ SimManager.Gravity = this.vessel.mainBody.gravParameter / (radius * radius);
+ }
+
+ SimManager.minSimTime = (long)(this.updatePeriod * 1000);
+
+ SimManager.TryStartSimulation();
+ }
+ #if DEBUG
+ else
+ {
+ Tools.PostDebugMessage(this, "VesselSimulator results not ready.");
+ }
+ #endif
+ }
+
protected void LoadModulesOfType<T>()
{
var types = AssemblyLoader.loadedAssemblies
@@ -890,7 +939,7 @@
protected void InitializeToolbarButton()
{
- // Do nothing if the Toolbar is not available.
+ // Do nothing if (the Toolbar is not available.
if (!ToolbarManager.ToolbarAvailable)
{
return;
@@ -917,7 +966,7 @@
{
this.AppLauncherButton = ApplicationLauncher.Instance.AddModApplication(
this.ToggleMainWindow, this.ToggleMainWindow,
- HighLogic.LoadedScene.ToAppScenes(),
+ this.appIconVisibleScenes,
this.VOIDIconTexture
);
@@ -1023,27 +1072,6 @@
this.configDirty = false;
}
- public void onSceneChangeRequested(GameScenes scene)
- {
- if (this.AppLauncherButton != null)
- {
- if (this is VOID_EditorCore)
- {
- if (!HighLogic.LoadedSceneIsEditor)
- {
- ApplicationLauncher.Instance.RemoveModApplication(this.AppLauncherButton);
- }
- }
- else
- {
- if (!HighLogic.LoadedSceneIsFlight)
- {
- ApplicationLauncher.Instance.RemoveModApplication(this.AppLauncherButton);
- }
- }
- }
- }
-
protected VOID_Core()
{
this._Name = "VOID Core";
@@ -1071,6 +1099,20 @@
this.SetIconTexture(this.powerState | this.activeState);
}
+ public virtual void Dispose()
+ {
+ if (this.AppLauncherButton != null)
+ {
+ ApplicationLauncher.Instance.RemoveModApplication(this.AppLauncherButton);
+ this.AppLauncherButton = null;
+ }
+ if (this.ToolbarButton != null)
+ {
+ this.ToolbarButton.Destroy();
+ this.ToolbarButton = null;
+ }
+ }
+
protected enum IconState
{
PowerOff = 1,
@@ -1101,9 +1143,16 @@
{
get
{
- return core.Kerbin.gravParameter / (core.Kerbin.Radius * core.Kerbin.Radius);
- }
- }
+ if (kerbinGee == default(double))
+ {
+ kerbinGee = core.Kerbin.gravParameter / (core.Kerbin.Radius * core.Kerbin.Radius);
+ }
+
+ return kerbinGee;
+ }
+ }
+
+ private static double kerbinGee;
}
}
--- a/VOID_EditorCore.cs
+++ b/VOID_EditorCore.cs
@@ -74,12 +74,20 @@
}
}
+ protected override ApplicationLauncher.AppScenes appIconVisibleScenes
+ {
+ get
+ {
+ return ApplicationLauncher.AppScenes.VAB | ApplicationLauncher.AppScenes.SPH;
+ }
+ }
+
public VOID_EditorCore() : base()
{
this._Name = "VOID Editor Core";
}
- public new void OnGUI() {}
+ public override void OnGUI() {}
public override void DrawGUI()
{
@@ -100,7 +108,7 @@
base.DrawGUI();
}
- public new void Update()
+ public override void Update()
{
foreach (IVOID_EditorModule module in this.Modules)
{
@@ -131,18 +139,14 @@
if (EditorLogic.SortedShipList.Count > 0 && this.vesselSimActive)
{
- SimManager.Gravity = VOID_Data.KerbinGee;
- SimManager.TryStartSimulation();
- }
- else if (!this.vesselSimActive)
- {
- SimManager.ClearResults();
+ Tools.PostDebugMessage(this, "Updating SimManager.");
+ this.UpdateSimManager();
}
this.CheckAndSave ();
}
- public new void FixedUpdate() {}
+ public override void FixedUpdate() {}
}
}
--- a/VOID_EditorHUD.cs
+++ b/VOID_EditorHUD.cs
@@ -143,7 +143,7 @@
{
SimManager.RequestSimulation();
- if (SimManager.LastStage == null)
+ if (this.core.LastStage == null)
{
return;
}
@@ -175,7 +175,7 @@
labelStyle.normal.textColor = textColors [ColorIndex];
hudString.Append("Total Mass: ");
- hudString.Append(SimManager.LastStage.totalMass.ToString("F3"));
+ hudString.Append(this.core.LastStage.totalMass.ToString("F3"));
hudString.Append('t');
hudString.Append(' ');
@@ -186,19 +186,19 @@
hudString.Append('\n');
hudString.Append("Total Delta-V: ");
- hudString.Append(Tools.MuMech_ToSI(SimManager.LastStage.totalDeltaV));
+ hudString.Append(Tools.MuMech_ToSI(this.core.LastStage.totalDeltaV));
hudString.Append("m/s");
hudString.Append('\n');
hudString.Append("Bottom Stage Delta-V");
- hudString.Append(Tools.MuMech_ToSI(SimManager.LastStage.deltaV));
+ hudString.Append(Tools.MuMech_ToSI(this.core.LastStage.deltaV));
hudString.Append("m/s");
hudString.Append('\n');
hudString.Append("Bottom Stage T/W Ratio: ");
- hudString.Append(SimManager.LastStage.thrustToWeight.ToString("F3"));
+ hudString.Append(this.core.LastStage.thrustToWeight.ToString("F3"));
if (this.CoMmarker.gameObject.activeInHierarchy && this.CoTmarker.gameObject.activeInHierarchy)
{
--- a/VOID_HUDAdvanced.cs
+++ b/VOID_HUDAdvanced.cs
@@ -433,18 +433,18 @@
"Nominal Stage Thrust",
delegate()
{
- if (SimManager.LastStage == null)
+ if (core.LastStage == null)
{
return double.NaN;
}
- if (SimManager.LastStage.actualThrust == 0d)
- {
- return SimManager.LastStage.thrust;
- }
- else
- {
- return SimManager.LastStage.actualThrust;
+ if (core.LastStage.actualThrust == 0d)
+ {
+ return core.LastStage.thrust;
+ }
+ else
+ {
+ return core.LastStage.actualThrust;
}
},
"kN"
@@ -454,12 +454,12 @@
"Stage Mass Flow",
delegate()
{
- if (SimManager.LastStage == null)
+ if (core.LastStage == null)
{
return double.NaN;
}
- double stageIsp = SimManager.LastStage.isp;
+ double stageIsp = core.LastStage.isp;
double stageThrust = stageNominalThrust;
Tools.PostDebugMessage(typeof(VOID_Data), "calculating stageMassFlow from:\n" +
@@ -528,7 +528,7 @@
"Total Burn Time",
delegate()
{
- if (SimManager.LastStage == null || currManeuverDeltaV.Value == double.NaN)
+ if (core.LastStage == null || currManeuverDeltaV.Value == double.NaN)
{
return double.NaN;
}
@@ -544,7 +544,7 @@
"Burn Time Remaining",
delegate()
{
- if (SimManager.LastStage == null || currManeuverDVRemaining == double.NaN)
+ if (core.LastStage == null || currManeuverDVRemaining == double.NaN)
{
return double.NaN;
}
@@ -560,7 +560,7 @@
"Half Burn Time",
delegate()
{
- if (SimManager.LastStage == null || currManeuverDeltaV.Value == double.NaN)
+ if (core.LastStage == null || currManeuverDeltaV.Value == double.NaN)
{
return double.NaN;
}
@@ -576,7 +576,7 @@
"Full burn time to be half done at node",
delegate()
{
- if (SimManager.LastStage == null && upcomingManeuverNodes < 1)
+ if (core.LastStage == null && upcomingManeuverNodes < 1)
{
return "N/A";
}
@@ -617,7 +617,7 @@
"Full burn time to be half done at node",
delegate()
{
- if (SimManager.LastStage == null && upcomingManeuverNodes < 1)
+ if (core.LastStage == null && upcomingManeuverNodes < 1)
{
return "N/A";
}
@@ -630,6 +630,11 @@
}
double interval = (node.UT - currentNodeHalfBurnDuration) - Planetarium.GetUniversalTime();
+
+ if (double.IsNaN(interval))
+ {
+ return string.Intern("NaN");
+ }
int sign = Math.Sign(interval);
interval = Math.Abs(interval);
--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -215,9 +215,17 @@
public abstract class VOID_WindowModule : VOID_Module
{
[AVOID_SaveValue("WindowPos")]
- protected Rect WindowPos = new Rect(Screen.width / 2, Screen.height / 2, 250f, 50f);
- protected float defWidth = 250f;
- protected float defHeight = 50f;
+ protected Rect WindowPos;
+ protected float defWidth;
+ protected float defHeight;
+
+ public VOID_WindowModule() : base()
+ {
+ this.defWidth = 250f;
+ this.defHeight = 50f;
+
+ this.WindowPos = new Rect(Screen.width / 2, Screen.height / 2, this.defWidth, this.defHeight);
+ }
public abstract void ModuleWindow(int _);
--- a/VOID_Transfer.cs
+++ b/VOID_Transfer.cs
@@ -39,7 +39,7 @@
{
protected List<CelestialBody> selectedBodies = new List<CelestialBody>();
- public VOID_Transfer()
+ public VOID_Transfer() : base()
{
this._Name = "Transfer Angle Information";
--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -108,12 +108,12 @@
"Total Mass",
delegate()
{
- if (SimManager.Stages == null || SimManager.LastStage == null)
+ if (core.Stages == null || core.LastStage == null)
{
return double.NaN;
}
- return SimManager.LastStage.totalMass;
+ return core.LastStage.totalMass;
},
"tons"
);
@@ -122,12 +122,12 @@
"Resource Mass",
delegate()
{
- if (SimManager.Stages == null || SimManager.LastStage == null)
+ if (core.Stages == null || core.LastStage == null)
{
return double.NaN;
}
- return SimManager.LastStage.totalMass - SimManager.LastStage.totalBaseMass;
+ return core.LastStage.totalMass - core.LastStage.totalBaseMass;
},
"tons"
);
@@ -136,12 +136,12 @@
"Resource Mass (Stage)",
delegate()
{
- if (SimManager.LastStage == null)
+ if (core.LastStage == null)
{
return double.NaN;
}
- return SimManager.LastStage.mass - SimManager.LastStage.baseMass;
+ return core.LastStage.mass - core.LastStage.baseMass;
},
"tons"
);
@@ -161,9 +161,9 @@
"DeltaV (Current Stage)",
delegate()
{
- if (SimManager.Stages == null || SimManager.LastStage == null)
- return double.NaN;
- return SimManager.LastStage.deltaV;
+ if (core.Stages == null || core.LastStage == null)
+ return double.NaN;
+ return core.LastStage.deltaV;
},
"m/s"
);
@@ -172,9 +172,9 @@
"DeltaV (Total)",
delegate()
{
- if (SimManager.Stages == null || SimManager.LastStage == null)
- return double.NaN;
- return SimManager.LastStage.totalDeltaV;
+ if (core.Stages == null || core.LastStage == null)
+ return double.NaN;
+ return core.LastStage.totalDeltaV;
},
"m/s"
);
@@ -189,11 +189,11 @@
"Thrust (curr/max)",
delegate()
{
- if (SimManager.Stages == null || SimManager.LastStage == null)
+ if (core.Stages == null || core.LastStage == null)
return "N/A";
- double currThrust = SimManager.LastStage.actualThrust;
- double maxThrust = SimManager.LastStage.thrust;
+ double currThrust = core.LastStage.actualThrust;
+ double maxThrust = core.LastStage.thrust;
return string.Format(
"{0} / {1}",
@@ -207,12 +207,12 @@
"T:W Ratio",
delegate()
{
- if (SimManager.LastStage == null)
+ if (core.LastStage == null)
{
return double.NaN;
}
- return SimManager.LastStage.actualThrustToWeight;
+ return core.LastStage.actualThrustToWeight;
},
""
);
@@ -221,12 +221,12 @@
"T:W Ratio",
delegate()
{
- if (SimManager.LastStage == null)
+ if (core.LastStage == null)
{
return double.NaN;
}
- return SimManager.LastStage.thrustToWeight;
+ return core.LastStage.thrustToWeight;
},
""
);
@@ -235,7 +235,7 @@
"T:W (curr/max)",
delegate()
{
- if (SimManager.Stages == null || SimManager.LastStage == null)
+ if (core.Stages == null || core.LastStage == null)
return "N/A";
return string.Format(
@@ -250,11 +250,11 @@
"Max T:W @ surface",
delegate()
{
- if (SimManager.Stages == null || SimManager.LastStage == null)
- return double.NaN;
-
- double maxThrust = SimManager.LastStage.thrust;
- double mass = SimManager.LastStage.totalMass;
+ if (core.Stages == null || core.LastStage == null)
+ return double.NaN;
+
+ double maxThrust = core.LastStage.thrust;
+ double mass = core.LastStage.totalMass;
double gravity = (VOID_Core.Constant_G * core.vessel.mainBody.Mass) /
(core.vessel.mainBody.Radius * core.vessel.mainBody.Radius);
double weight = mass * gravity;
--- a/VOID_VesselRegister.cs
+++ b/VOID_VesselRegister.cs
@@ -58,7 +58,7 @@
}
}
- public VOID_VesselRegister()
+ public VOID_VesselRegister() : base()
{
this._Name = "Vessel Register";