VOID_HUDAdvanced: Fixed VOID_Data.burnTime to use an actually-correct formula.
--- 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.3.*")]
// 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.csproj
+++ b/VOID.csproj
@@ -97,6 +97,7 @@
<Compile Include="VOID_HUDAdvanced.cs" />
<Compile Include="VOID_TWR.cs" />
<Compile Include="VOID_CareerStatus.cs" />
+ <Compile Include="VOID_StageInfo.cs" />
</ItemGroup>
<ProjectExtensions>
<MonoDevelop>
--- a/VOID_CBInfoBrowser.cs
+++ b/VOID_CBInfoBrowser.cs
@@ -50,6 +50,9 @@
[AVOID_SaveValue("togglePhysical")]
protected VOID_SaveValue<bool> togglePhysical = false;
+
+ [AVOID_SaveValue("toggleScience")]
+ protected VOID_SaveValue<bool> toggleScience = false;
public VOID_CBInfoBrowser()
{
@@ -208,6 +211,72 @@
GUILayout.EndHorizontal();
}
+ if (GUILayout.Button("Scientific Parameters", GUILayout.ExpandWidth(true)))
+ {
+ toggleScience.value = !toggleScience;
+ }
+
+ if (toggleScience)
+ {
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+ //begin physical info value label column
+ GUILayout.BeginVertical(GUILayout.Width(150));
+
+
+ /*
+ * public float RecoveryValue = 1f;
+
+ public float InSpaceHighDataValue = 1f;
+
+ public float spaceAltitudeThreshold = 250000f;
+
+ public float flyingAltitudeThreshold = 18000f;
+
+ public float InSpaceLowDataValue = 1f;
+
+ public float SplashedDataValue = 1f;
+
+ public float LandedDataValue = 1f;
+
+ public float FlyingHighDataValue = 1f;
+
+ public float FlyingLowDataValue = 1f;
+ */
+
+ GUILayout.Label("Surface Multiplier:");
+ GUILayout.Label("Ocean Multiplier:");
+ GUILayout.Label("Flying-Low Multiplier:");
+ GUILayout.Label("Flying-High Multiplier:");
+ GUILayout.Label("Low Orbit Multiplier:");
+ GUILayout.Label("High Orbit Multiplier:");
+ GUILayout.Label("'Flying-High' Altitude:");
+ GUILayout.Label("'High Orbit' Altitude:");
+ GUILayout.Label("Recovery Multiplier:");
+
+ //end physical info value label column
+ GUILayout.EndVertical();
+
+ //begin primary physical values column
+ GUILayout.BeginVertical(GUILayout.Width(150));
+
+ this.cbColumnScience(selectedBody1);
+
+ //end primary physical column
+ GUILayout.EndVertical();
+
+ //begin secondary physical values column
+ GUILayout.BeginVertical(GUILayout.Width(150));
+
+ this.cbColumnScience(selectedBody2);
+
+ //end target physical values column
+ GUILayout.EndVertical();
+
+ //end physical value horizontal chunk
+ GUILayout.EndHorizontal();
+ }
+
GUI.DragWindow();
}
@@ -323,5 +392,61 @@
if (body.ocean == true) ocean = "Yes";
GUILayout.Label(ocean, this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
}
+
+ private void cbColumnScience(CelestialBody body)
+ {
+ /*GUILayout.Label("Surface Science Multiplier:");
+ GUILayout.Label("Ocean Science Multiplier:");
+ GUILayout.Label("Low-Atmosphere Science Multiplier:");
+ GUILayout.Label("High-Atmosphere Science Multiplier:");
+ GUILayout.Label("Low Orbit Science Multiplier:");
+ GUILayout.Label("High Orbit Science Multiplier:");
+ GUILayout.Label("'In Space' Altitude:");
+ GUILayout.Label("'Flying' Altitude:");
+ GUILayout.Label("Recovery Multiplier:");*/
+
+ var scienceValues = body.scienceValues;
+
+ GUILayout.Label(scienceValues.LandedDataValue.ToString("0.0#"),
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(
+ body.ocean ? scienceValues.SplashedDataValue.ToString("0.0#") : "N/A",
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(
+ body.atmosphere ? scienceValues.FlyingLowDataValue.ToString("0.0#") : "N/A",
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(
+ body.atmosphere ? scienceValues.FlyingHighDataValue.ToString("0.0#") : "N/A",
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(scienceValues.InSpaceLowDataValue.ToString("0.0#"),
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(scienceValues.InSpaceHighDataValue.ToString("0.0#"),
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(
+ body.atmosphere ? scienceValues.flyingAltitudeThreshold.ToString("N0") : "N/A",
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(
+ scienceValues.spaceAltitudeThreshold.ToString("N0"),
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(scienceValues.RecoveryValue.ToString("0.0#"),
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+ }
}
}
--- a/VOID_CareerStatus.cs
+++ b/VOID_CareerStatus.cs
@@ -166,19 +166,20 @@
GUI.DragWindow();
}
- private void onFundsChange(double newValue)
+ // TODO: Update event handlers to do something useful with the new "reasons" parameter.
+ private void onFundsChange(double newValue, TransactionReasons reasons)
{
this.lastFundsChange = newValue - this.currentFunds;
this.currentFunds = newValue;
}
- private void onRepChange(float newValue)
+ private void onRepChange(float newValue, TransactionReasons reasons)
{
this.lastRepChange = newValue - this.currentReputation;
this.currentReputation = newValue;
}
- private void onScienceChange(float newValue)
+ private void onScienceChange(float newValue, TransactionReasons reasons)
{
this.lastScienceChange = newValue - this.currentScience;
this.currentScience = newValue;
--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -31,6 +31,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Text;
using ToadicusTools;
using UnityEngine;
@@ -70,6 +71,7 @@
public static void Reset()
{
_instance.StopGUI();
+ _instance.Dispose();
_instance = null;
_initialized = false;
}
@@ -165,7 +167,8 @@
"ExpRecoveryDialogSkin",
"KSP window 5",
"KSP window 6",
- "PartTooltipSkin"
+ "PartTooltipSkin",
+ "KSCContextMenuSkin"
};
protected bool skinsLoaded = false;
@@ -243,6 +246,12 @@
}
}
+ public List<CelestialBody> sortedBodyList
+ {
+ get;
+ private set;
+ }
+
public CelestialBody Kerbin
{
get
@@ -281,6 +290,18 @@
{
return this._updatePeriod;
}
+ }
+
+ public Stage[] Stages
+ {
+ get;
+ protected set;
+ }
+
+ public Stage LastStage
+ {
+ get;
+ protected set;
}
protected IconState powerState
@@ -348,6 +369,14 @@
}
}
+ protected virtual ApplicationLauncher.AppScenes appIconVisibleScenes
+ {
+ get
+ {
+ return ApplicationLauncher.AppScenes.FLIGHT;
+ }
+ }
+
/*
* Methods
* */
@@ -370,17 +399,33 @@
if (!this.GUIStylesLoaded)
{
this.LoadGUIStyles();
+
+ Tools.PostDebugMessage(
+ this,
+ "ToolbarAvailable: {0}, UseToobarManager: {1}",
+ ToolbarManager.ToolbarAvailable,
+ this.UseToolbarManager);
}
if (!this.UseToolbarManager)
{
if (this.AppLauncherButton == null)
{
+ Tools.PostDebugMessage(this,
+ "UseToolbarManager = false (ToolbarAvailable = {0}) and " +
+ "AppLauncherButton is null, making AppLauncher button.",
+ ToolbarManager.ToolbarAvailable
+ );
this.InitializeAppLauncherButton();
}
}
else if (this.ToolbarButton == null)
{
+ Tools.PostDebugMessage(this,
+ "UseToolbarManager = true (ToolbarAvailable = {0}) and " +
+ "ToolbarButton is null, making Toolbar button.",
+ ToolbarManager.ToolbarAvailable
+ );
this.InitializeToolbarButton();
}
@@ -398,7 +443,14 @@
GUILayout.Height(50)
);
- _mainWindowPos = Tools.ClampRectToScreen(_mainWindowPos);
+ if (HighLogic.LoadedSceneIsEditor)
+ {
+ _mainWindowPos = Tools.ClampRectToEditorPad(_mainWindowPos);
+ }
+ else
+ {
+ _mainWindowPos = Tools.ClampRectToScreen(_mainWindowPos);
+ }
if (_mainWindowPos != this.mainWindowPos)
{
@@ -419,7 +471,14 @@
GUILayout.Height(50)
);
- _configWindowPos = Tools.ClampRectToScreen(_configWindowPos);
+ if (HighLogic.LoadedSceneIsEditor)
+ {
+ _configWindowPos = Tools.ClampRectToEditorPad(_configWindowPos);
+ }
+ else
+ {
+ _configWindowPos = Tools.ClampRectToScreen(_configWindowPos);
+ }
if (_configWindowPos != this.configWindowPos)
{
@@ -428,7 +487,7 @@
}
}
- public void OnGUI()
+ public virtual void OnGUI()
{
if (Event.current.type == EventType.Repaint)
{
@@ -482,21 +541,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 +585,7 @@
this._updateTimer += Time.deltaTime;
}
- public void FixedUpdate()
+ public virtual void FixedUpdate()
{
bool newPowerState = this.powerAvailable;
@@ -703,7 +755,7 @@
this.stringFrequency = (1f / this.updatePeriod).ToString();
}
this.stringFrequency = GUILayout.TextField(this.stringFrequency.ToString(), 5, GUILayout.ExpandWidth(true));
- // GUILayout.FlexibleSpace();
+
if (GUILayout.Button("Apply"))
{
double updateFreq = 1f / this.updatePeriod;
@@ -720,45 +772,89 @@
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
- .Select(a => a.assembly.GetExportedTypes())
- .SelectMany(t => t)
- .Where(v => typeof(T).IsAssignableFrom(v)
- && !(v.IsInterface || v.IsAbstract) &&
- !typeof(VOID_Core).IsAssignableFrom(v)
- );
-
- Tools.PostDebugMessage(string.Format(
- "{0}: Found {1} modules to check.",
- this.GetType().Name,
- types.Count()
- ));
- foreach (var voidType in types)
- {
- if (!HighLogic.LoadedSceneIsEditor &&
- typeof(IVOID_EditorModule).IsAssignableFrom(voidType))
- {
- continue;
- }
-
- Tools.PostDebugMessage(string.Format(
- "{0}: found Type {1}",
- this.GetType().Name,
- voidType.Name
- ));
-
- this.LoadModule(voidType);
+ StringBuilder sb = new StringBuilder("Loading modules...");
+ sb.AppendLine();
+
+ foreach (AssemblyLoader.LoadedAssembly assy in AssemblyLoader.loadedAssemblies)
+ {
+ foreach (Type loadedType in assy.assembly.GetExportedTypes())
+ {
+ if (
+ loadedType.IsInterface ||
+ loadedType.IsAbstract ||
+ !typeof(T).IsAssignableFrom(loadedType) ||
+ this.GetType().IsAssignableFrom(loadedType)
+ )
+ {
+ continue;
+ }
+
+ // HACK: This stops editor modules from loading in flight. It is a dirty hack and should be fixed.
+ if (!HighLogic.LoadedSceneIsEditor && typeof(IVOID_EditorModule).IsAssignableFrom(loadedType))
+ {
+ continue;
+ }
+
+ sb.AppendFormat("Loading IVOID_Module type {0}...", loadedType.Name);
+
+ try
+ {
+ this.LoadModule(loadedType);
+ sb.AppendLine("Success.");
+ }
+ catch (Exception ex)
+ {
+ sb.AppendFormat("Failed, caught {0}", ex.GetType().Name);
+ sb.AppendLine();
+
+ #if DEBUG
+ Debug.LogException(ex);
+ #endif
+ }
+ }
}
this._modulesLoaded = true;
- Tools.PostDebugMessage(string.Format(
- "{0}: Loaded {1} modules.",
- this.GetType().Name,
- this.Modules.Count
- ));
+ sb.AppendFormat("Loaded {0} modules.", this.Modules.Count);
+ sb.AppendLine();
}
protected void LoadModule(Type T)
@@ -866,10 +962,7 @@
this.iconStyle = new GUIStyle(GUI.skin.button);
this.iconStyle.padding = new RectOffset(0, 0, 0, 0);
- // this.iconStyle.margin = new RectOffset(0, 0, 0, 0);
- // this.iconStyle.contentOffset = new Vector2(0, 0);
this.iconStyle.overflow = new RectOffset(0, 0, 0, 0);
- // this.iconStyle.border = new RectOffset(0, 0, 0, 0);
this.GUIStylesLoaded = true;
}
@@ -886,13 +979,24 @@
{
this.LoadVesselTypes();
}
+
+ if (this.sortedBodyList == null && FlightGlobals.Bodies != null && FlightGlobals.Bodies.Count > 0)
+ {
+ this.sortedBodyList = new List<CelestialBody>(FlightGlobals.Bodies);
+ this.sortedBodyList.Sort(new CBListComparer());
+ this.sortedBodyList.Reverse();
+
+ Debug.Log(string.Format("sortedBodyList: {0}", string.Join("\n\t", this.sortedBodyList.Select(b => b.bodyName).ToArray())));
+ }
+
}
protected void InitializeToolbarButton()
{
- // Do nothing if the Toolbar is not available.
+ // Do nothing if (the Toolbar is not available.
if (!ToolbarManager.ToolbarAvailable)
{
+ Tools.PostDebugMessage(this, "Refusing to make a ToolbarButton: ToolbarAvailable = false");
return;
}
@@ -917,7 +1021,7 @@
{
this.AppLauncherButton = ApplicationLauncher.Instance.AddModApplication(
this.ToggleMainWindow, this.ToggleMainWindow,
- HighLogic.LoadedScene.ToAppScenes(),
+ this.appIconVisibleScenes,
this.VOIDIconTexture
);
@@ -1023,27 +1127,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";
@@ -1052,7 +1135,7 @@
this.VoidVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.MajorRevision);
- this._Active.value = true;
+ this.toggleActive = true;
this._skinName = this.defaultSkin;
this._skinIdx = int.MinValue;
@@ -1071,6 +1154,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 +1198,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_DataLogger.cs
+++ b/VOID_DataLogger.cs
@@ -29,6 +29,7 @@
using KSP;
using System;
using System.Collections.Generic;
+using System.Text;
using ToadicusTools;
using UnityEngine;
@@ -139,7 +140,10 @@
GUILayout.EndHorizontal();
float new_log_interval;
- if (Single.TryParse(csv_log_interval_str, out new_log_interval)) csv_log_interval = new_log_interval;
+ if (float.TryParse(csv_log_interval_str, out new_log_interval))
+ {
+ csv_log_interval = new_log_interval;
+ }
GUILayout.EndVertical();
GUI.DragWindow();
@@ -206,41 +210,97 @@
//called if logging is on and interval has passed
//writes one line to the csvList
- string line = "";
+ StringBuilder line = new StringBuilder();
+
if (first_write && !KSP.IO.File.Exists<VOID_Core>(vessel.vesselName + "_data.csv", null))
{
first_write = false;
- line += "Mission Elapsed Time (s);Altitude ASL (m);Altitude above terrain (m);Orbital Velocity (m/s);Surface Velocity (m/s);Vertical Speed (m/s);Horizontal Speed (m/s);Gee Force (gees);Temperature (°C);Gravity (m/s²);Atmosphere Density (g/m³);\n";
- }
+ line.Append(
+ "Mission Elapsed Time (s);" +
+ "Altitude ASL (m);" +
+ "Altitude above terrain (m);" +
+ "Surface Latitude (°);" +
+ "Surface Longitude (°);" +
+ "Orbital Velocity (m/s);" +
+ "Surface Velocity (m/s);" +
+ "Vertical Speed (m/s);" +
+ "Horizontal Speed (m/s);" +
+ "Gee Force (gees);" +
+ "Temperature (°C);" +
+ "Gravity (m/s²);" +
+ "Atmosphere Density (g/m³);" +
+ "Downrange Distance (m);" +
+ "\n"
+ );
+ }
+
//Mission time
- line += vessel.missionTime.ToString("F3") + ";";
+ line.Append(vessel.missionTime.ToString("F3"));
+ line.Append(';');
+
//Altitude ASL
- line += vessel.orbit.altitude.ToString("F3") + ";";
+ line.Append(vessel.orbit.altitude.ToString("F3"));
+ line.Append(';');
+
//Altitude (true)
double alt_true = vessel.orbit.altitude - vessel.terrainAltitude;
if (vessel.terrainAltitude < 0) alt_true = vessel.orbit.altitude;
- line += alt_true.ToString("F3") + ";";
+ line.Append(alt_true.ToString("F3"));
+ line.Append(';');
+
+ // Surface Latitude
+ line.Append(VOID_Data.surfLatitude.Value);
+ line.Append(';');
+
+ // Surface Longitude
+ line.Append(VOID_Data.surfLongitude.Value);
+ line.Append(';');
+
//Orbital velocity
- line += vessel.orbit.vel.magnitude.ToString("F3") + ";";
+ line.Append(vessel.orbit.vel.magnitude.ToString("F3"));
+ line.Append(';');
+
//surface velocity
- line += vessel.srf_velocity.magnitude.ToString("F3") + ";";
+ line.Append(vessel.srf_velocity.magnitude.ToString("F3"));
+ line.Append(';');
+
//vertical speed
- line += vessel.verticalSpeed.ToString("F3") + ";";
+ line.Append(vessel.verticalSpeed.ToString("F3"));
+ line.Append(';');
+
//horizontal speed
- line += vessel.horizontalSrfSpeed.ToString("F3") + ";";
+ line.Append(vessel.horizontalSrfSpeed.ToString("F3"));
+ line.Append(';');
+
//gee force
- line += vessel.geeForce.ToString("F3") + ";";
+ line.Append(vessel.geeForce.ToString("F3"));
+ line.Append(';');
+
//temperature
- line += vessel.flightIntegrator.getExternalTemperature().ToString("F2") + ";";
+ line.Append(vessel.flightIntegrator.getExternalTemperature().ToString("F2"));
+ line.Append(';');
+
//gravity
double r_vessel = vessel.mainBody.Radius + vessel.mainBody.GetAltitude(vessel.findWorldCenterOfMass());
double g_vessel = (VOID_Core.Constant_G * vessel.mainBody.Mass) / (r_vessel * r_vessel);
- line += g_vessel.ToString("F3") + ";";
+ line.Append(g_vessel.ToString("F3"));
+ line.Append(';');
+
//atm density
- line += (vessel.atmDensity * 1000).ToString("F3") + ";";
- line += "\n";
- if (csvList.Contains(line) == false) csvList.Add(line);
+ line.Append((vessel.atmDensity * 1000).ToString("F3"));
+ line.Append(';');
+
+ // Downrange Distance
+ line.Append((VOID_Data.downrangeDistance.Value.ToString("G3")));
+ line.Append(';');
+
+ line.Append('\n');
+
+ csvList.Add(line.ToString());
+
csvCollectTimer = 0f;
}
}
}
+
+
--- a/VOID_EditorCore.cs
+++ b/VOID_EditorCore.cs
@@ -69,8 +69,17 @@
if (_initialized)
{
_instance.StopGUI();
+ _instance.Dispose();
_instance = null;
_initialized = false;
+ }
+ }
+
+ protected override ApplicationLauncher.AppScenes appIconVisibleScenes
+ {
+ get
+ {
+ return ApplicationLauncher.AppScenes.VAB | ApplicationLauncher.AppScenes.SPH;
}
}
@@ -79,7 +88,7 @@
this._Name = "VOID Editor Core";
}
- public new void OnGUI() {}
+ public override void OnGUI() {}
public override void DrawGUI()
{
@@ -90,7 +99,7 @@
Rect _iconPos = Tools.DockToWindow (this.VOIDIconPos, this.mainWindowPos);
- _iconPos = Tools.ClampRectToScreen (_iconPos, (int)_iconPos.width, (int)_iconPos.height);
+ _iconPos = Tools.ClampRectToEditorPad (_iconPos);
if (_iconPos != this.VOIDIconPos)
{
@@ -100,8 +109,10 @@
base.DrawGUI();
}
- public new void Update()
+ public override void Update()
{
+ this.LoadBeforeUpdate();
+
foreach (IVOID_EditorModule module in this.Modules)
{
if (EditorLogic.startPod == null)
@@ -131,18 +142,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
@@ -120,7 +120,7 @@
{
this._Name = "Heads-Up Display";
- this._Active.value = true;
+ this.toggleActive = true;
this.textColors.Add(Color.green);
this.textColors.Add(Color.black);
@@ -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_HUD.cs
+++ b/VOID_HUD.cs
@@ -85,7 +85,7 @@
{
this._Name = "Heads-Up Display";
- this._Active.value = true;
+ this.toggleActive = true;
this._colorIndex = 0;
@@ -189,6 +189,19 @@
VOID_Data.vesselHeading.ValueUnitString(),
VOID_Data.vesselPitch.ToSIString(2)
);
+
+ if (
+ this.core.vessel.mainBody == this.core.Kerbin &&
+ (
+ this.core.vessel.situation == Vessel.Situations.FLYING ||
+ this.core.vessel.situation == Vessel.Situations.SUB_ORBITAL ||
+ this.core.vessel.situation == Vessel.Situations.LANDED ||
+ this.core.vessel.situation == Vessel.Situations.SPLASHED
+ )
+ )
+ {
+ rightHUD.AppendFormat("\nRange to KSC: {0}", VOID_Data.downrangeDistance.ValueUnitString(2));
+ }
}
else
{
@@ -226,7 +239,7 @@
this.leftHUDPos.value = GUI.Window(
this.core.windowID,
this.leftHUDPos,
- this.leftHUDWindow,
+ VOID_Tools.GetWindowHandler(this.leftHUDWindow),
GUIContent.none,
GUIStyle.none
);
@@ -234,7 +247,7 @@
this.rightHUDPos.value = GUI.Window(
this.core.windowID,
this.rightHUDPos,
- this.rightHUDWindow,
+ VOID_Tools.GetWindowHandler(this.rightHUDWindow),
GUIContent.none,
GUIStyle.none
);
@@ -271,6 +284,44 @@
() => core.vessel.getSurfacePitch(),
"°"
);
+
+ public static readonly VOID_DoubleValue downrangeDistance = new VOID_DoubleValue(
+ "Downrange Distance",
+ delegate() {
+
+ if (core.vessel == null ||
+ Planetarium.fetch == null ||
+ core.vessel.mainBody != Planetarium.fetch.Home
+ )
+ {
+ return double.NaN;
+ }
+
+ double vesselLongitude = core.vessel.longitude * Math.PI / 180d;
+ double vesselLatitude = core.vessel.latitude * Math.PI / 180d;
+
+ const double kscLongitude = 285.442323427289 * Math.PI / 180d;
+ const double kscLatitude = -0.0972112860655246 * Math.PI / 180d;
+
+ double diffLon = vesselLongitude - kscLongitude;
+ double diffLat = vesselLatitude - kscLatitude;
+
+ double sinHalfDiffLat = Math.Sin(diffLat / 2d);
+ double sinHalfDiffLon = Math.Sin(diffLon / 2d);
+
+ double cosVesselLon = Math.Cos(vesselLongitude);
+ double cosKSCLon = Math.Cos(kscLongitude);
+
+ double haversine =
+ sinHalfDiffLat * sinHalfDiffLat +
+ cosVesselLon * cosKSCLon * sinHalfDiffLon * sinHalfDiffLon;
+
+ double arc = 2d * Math.Atan2(Math.Sqrt(haversine), Math.Sqrt(1d - haversine));
+
+ return core.vessel.mainBody.Radius * arc;
+ },
+ "m"
+ );
}
}
--- a/VOID_HUDAdvanced.cs
+++ b/VOID_HUDAdvanced.cs
@@ -78,7 +78,7 @@
{
this._Name = "Advanced Heads-Up Display";
- this._Active.value = true;
+ this.toggleActive = true;
this.leftHUDdefaultPos = new Rect(
Screen.width * .5f - (float)GameSettings.UI_SIZE * .25f - 300f,
@@ -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);
@@ -661,7 +666,7 @@
massFlow,
thrust
);
- return initialMass / massFlow * (Math.Exp(deltaV * massFlow / thrust) - 1d);
+ return initialMass / massFlow * (1d - Math.Exp(-deltaV * massFlow / thrust));
}
}
}
--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -215,9 +215,21 @@
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;
+
+ protected string inputLockName;
+
+ public VOID_WindowModule() : base()
+ {
+ this.defWidth = 250f;
+ this.defHeight = 50f;
+
+ this.inputLockName = string.Concat(this.Name, "_edlock");
+
+ this.WindowPos = new Rect(Screen.width / 2, Screen.height / 2, this.defWidth, this.defHeight);
+ }
public abstract void ModuleWindow(int _);
@@ -236,7 +248,56 @@
GUILayout.Height(this.defHeight)
);
- _Pos = Tools.ClampRectToScreen (_Pos);
+ bool cursorInWindow = _Pos.Contains(Mouse.screenPos);
+
+ switch (HighLogic.LoadedScene)
+ {
+ case GameScenes.EDITOR:
+ case GameScenes.SPH:
+ if (cursorInWindow)
+ {
+ InputLockManager.SetControlLock(
+ ControlTypes.EDITOR_ICON_HOVER | ControlTypes.EDITOR_ICON_PICK |
+ ControlTypes.EDITOR_PAD_PICK_COPY | ControlTypes.EDITOR_PAD_PICK_COPY,
+ this.inputLockName
+ );
+ EditorLogic.fetch.Lock(false, false, false, this.inputLockName);
+ }
+ else
+ {
+ EditorLogic.fetch.Unlock(this.inputLockName);
+ }
+ break;
+ case GameScenes.FLIGHT:
+ if (cursorInWindow)
+ {
+ InputLockManager.SetControlLock(ControlTypes.CAMERACONTROLS, this.inputLockName);
+ }
+ else if (InputLockManager.GetControlLock(this.inputLockName) != ControlTypes.None)
+ {
+ InputLockManager.RemoveControlLock(this.inputLockName);
+ }
+ break;
+ case GameScenes.SPACECENTER:
+ if (cursorInWindow)
+ {
+ InputLockManager.SetControlLock(ControlTypes.KSC_FACILITIES, this.inputLockName);
+ }
+ else if (InputLockManager.GetControlLock(this.inputLockName) != ControlTypes.None)
+ {
+ InputLockManager.RemoveControlLock(this.inputLockName);
+ }
+ break;
+ }
+
+ if (HighLogic.LoadedSceneIsEditor)
+ {
+ _Pos = Tools.ClampRectToEditorPad(_Pos);
+ }
+ else
+ {
+ _Pos = Tools.ClampRectToScreen(_Pos);
+ }
if (_Pos != this.WindowPos)
{
--- a/VOID_Rendezvous.cs
+++ b/VOID_Rendezvous.cs
@@ -130,7 +130,7 @@
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label(" ", GUILayout.ExpandWidth(true));
- if (GUILayout.Button("Close", GUILayout.ExpandWidth(false))) this._Active = false;
+ if (GUILayout.Button("Close", GUILayout.ExpandWidth(false))) this.toggleActive = false;
GUILayout.EndHorizontal();
GUILayout.EndVertical();
--- /dev/null
+++ b/VOID_StageInfo.cs
@@ -1,1 +1,200 @@
-
+// VOID © 2014 toadicus
+//
+// This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a
+// copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/
+
+using Engineer.VesselSimulator;
+using KSP;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ToadicusTools;
+using UnityEngine;
+
+namespace VOID
+{
+ public class VOID_StageInfo : VOID_WindowModule
+ {
+ private Table stageTable;
+
+ private Table.Column<int> stageNumberCol;
+ private Table.Column<double> stageDeltaVCol;
+ private Table.Column<double> stageTotalDVCol;
+ private Table.Column<double> stageMassCol;
+ private Table.Column<double> stageTotalMassCol;
+ private Table.Column<double> stageThrustCol;
+ private Table.Column<double> stageTWRCol;
+
+ private bool stylesApplied;
+ private bool showBodyList;
+
+ private Rect bodyListPos;
+
+ private CelestialBody selectedBody;
+ [AVOID_SaveValue("bodyIdx")]
+ private VOID_SaveValue<int> bodyIdx;
+ private int lastIdx;
+
+ public VOID_StageInfo() : base()
+ {
+ this._Name = "Stage Information";
+ this.defWidth = 200f;
+ this.bodyIdx = 4;
+
+ this.stylesApplied = false;
+ this.showBodyList = false;
+
+ this.bodyListPos = new Rect();
+
+ this.stageTable = new Table();
+
+ this.stageNumberCol = new Table.Column<int>("Stage", 40f);
+ this.stageTable.Add(this.stageNumberCol);
+
+ this.stageDeltaVCol = new Table.Column<double>("DeltaV [m/s]", 80f);
+ this.stageDeltaVCol.Format = "S2";
+ this.stageTable.Add(this.stageDeltaVCol);
+
+ this.stageTotalDVCol = new Table.Column<double>("Total ΔV [m/s]", 80f);
+ this.stageTotalDVCol.Format = "S2";
+ this.stageTable.Add(this.stageTotalDVCol);
+
+ this.stageMassCol = new Table.Column<double>("Mass [Mg]", 80f);
+ this.stageMassCol.Format = "#.#";
+ this.stageTable.Add(this.stageMassCol);
+
+ this.stageTotalMassCol = new Table.Column<double>("Total Mass [Mg]", 80f);
+ this.stageTotalMassCol.Format = "#.#";
+ this.stageTable.Add(this.stageTotalMassCol);
+
+ this.stageThrustCol = new Table.Column<double>("Thrust [N]", 80f);
+ this.stageThrustCol.Format = "S2";
+ this.stageTable.Add(this.stageThrustCol);
+
+ this.stageTWRCol = new Table.Column<double>("T/W Ratio", 80f);
+ this.stageTWRCol.Format = "#.#";
+ this.stageTable.Add(this.stageTWRCol);
+ }
+
+ public override void DrawGUI()
+ {
+ base.DrawGUI();
+
+ if (this.showBodyList)
+ {
+ GUILayout.Window(core.windowID, this.bodyListPos, this.BodyPickerWindow, string.Empty);
+ }
+ }
+
+ public override void ModuleWindow(int _)
+ {
+ if (
+ HighLogic.LoadedSceneIsEditor ||
+ (TimeWarp.WarpMode == TimeWarp.Modes.LOW) ||
+ (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate)
+ )
+ {
+ Engineer.VesselSimulator.SimManager.RequestSimulation();
+ }
+
+ if (!this.stylesApplied)
+ {
+ this.stageTable.ApplyCellStyle(core.LabelStyles["center"]);
+ this.stageTable.ApplyHeaderStyle(core.LabelStyles["center_bold"]);
+ }
+
+ this.stageTable.ClearColumns();
+
+ if (core.Stages == null || core.Stages.Length == 0)
+ {
+ GUILayout.BeginVertical();
+
+ GUILayout.Label("No stage data!");
+
+ GUILayout.EndVertical();
+
+ return;
+ }
+
+ foreach (Stage stage in core.Stages)
+ {
+ if (stage.deltaV == 0 && stage.mass == 0)
+ {
+ continue;
+ }
+
+ this.stageNumberCol.Add(stage.number);
+
+ this.stageDeltaVCol.Add(stage.deltaV);
+ this.stageTotalDVCol.Add(stage.totalDeltaV);
+
+ this.stageMassCol.Add(stage.mass);
+ this.stageTotalMassCol.Add(stage.totalMass);
+
+ this.stageThrustCol.Add(stage.thrust * 1000f);
+ this.stageTWRCol.Add(stage.thrustToWeight / (this.selectedBody ?? core.Kerbin).GeeASL);
+ }
+
+ this.stageTable.Render();
+
+ if (core.sortedBodyList != null)
+ {
+ GUILayout.BeginHorizontal();
+
+ if (GUILayout.Button("◄"))
+ {
+ this.bodyIdx--;
+ }
+
+ this.showBodyList = GUILayout.Toggle(this.showBodyList, (this.selectedBody ?? core.Kerbin).bodyName, GUI.skin.button);
+ Rect bodyButtonPos = GUILayoutUtility.GetLastRect();
+
+ if (Event.current.type == EventType.Repaint)
+ {
+ this.bodyListPos.width = bodyButtonPos.width;
+ this.bodyListPos.x = bodyButtonPos.xMin + this.WindowPos.xMin;
+ this.bodyListPos.y = bodyButtonPos.yMax + this.WindowPos.yMin;
+ }
+
+ if (GUILayout.Button("►"))
+ {
+ this.bodyIdx++;
+ }
+
+ this.bodyIdx %= core.sortedBodyList.Count;
+
+ if (this.bodyIdx < 0)
+ {
+ this.bodyIdx += core.sortedBodyList.Count;
+ }
+
+ if (this.lastIdx != this.bodyIdx)
+ {
+ this.lastIdx = this.bodyIdx;
+ this.selectedBody = core.sortedBodyList[this.bodyIdx];
+ }
+
+ GUILayout.EndHorizontal();
+ }
+
+ GUI.DragWindow();
+ }
+
+ private void BodyPickerWindow(int _)
+ {
+ foreach (CelestialBody body in core.sortedBodyList)
+ {
+ if (GUILayout.Button(body.bodyName, GUI.skin.button))
+ {
+ Debug.Log("Picked new body focus: " + body.bodyName);
+ this.bodyIdx = core.sortedBodyList.IndexOf(body);
+ this.showBodyList = false;
+ }
+ }
+ }
+ }
+
+ public class VOID_StageInfoEditor : VOID_StageInfo, IVOID_EditorModule {}
+}
+
+
--- a/VOID_SurfAtmo.cs
+++ b/VOID_SurfAtmo.cs
@@ -65,6 +65,9 @@
this.precisionValues [idx]= (ushort)VOID_Data.terrainElevation.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
+ this.precisionValues[idx] = (ushort)VOID_Data.downrangeDistance.DoGUIHorizontal(this.precisionValues[idx]);
+ idx++;
+
this.precisionValues [idx]= (ushort)VOID_Data.surfVelocity.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
@@ -76,7 +79,8 @@
VOID_Data.temperature.DoGUIHorizontal ("F2");
- VOID_Data.atmDensity.DoGUIHorizontal (3);
+ this.precisionValues [idx]= (ushort)VOID_Data.atmDensity.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
VOID_Data.atmPressure.DoGUIHorizontal ("F2");
--- a/VOID_TWR.cs
+++ b/VOID_TWR.cs
@@ -14,8 +14,6 @@
{
public class VOID_TWR : VOID_WindowModule
{
- private List<CelestialBody> sortedBodyList;
-
public VOID_TWR() : base()
{
this._Name = "IP Thrust-to-Weight Ratios";
@@ -34,26 +32,17 @@
GUILayout.BeginVertical();
- if (this.sortedBodyList == null)
+ if (core.sortedBodyList == null)
{
- if (FlightGlobals.Bodies != null && FlightGlobals.Bodies.Count > 0)
- {
- this.sortedBodyList = new List<CelestialBody>(FlightGlobals.Bodies);
- this.sortedBodyList.Sort(new CBListComparer());
- this.sortedBodyList.Reverse();
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- Debug.Log(string.Format("sortedBodyList: {0}", string.Join("\n\t", this.sortedBodyList.Select(b => b.bodyName).ToArray())));
- }
- else
- {
- GUILayout.BeginHorizontal();
- GUILayout.Label("Unavailable.");
- GUILayout.EndHorizontal();
- }
+ GUILayout.Label("Unavailable");
+
+ GUILayout.EndHorizontal();
}
else
{
- foreach (CelestialBody body in this.sortedBodyList)
+ foreach (CelestialBody body in core.sortedBodyList)
{
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
--- a/VOID_Tools.cs
+++ b/VOID_Tools.cs
@@ -341,11 +341,23 @@
#endif
{
Debug.LogWarning(
- string.Format("[{0}]: ArgumentException caught during window call.", func.Target.GetType().Name)
- );
+ string.Format("[{0}]: ArgumentException caught during window call. This is not a bug.",
+ func.Target.GetType().Name
+ ));
+
/*#if DEBUG
Debug.LogException(ex);
#endif*/
+ }
+ catch (Exception ex)
+ {
+ Debug.LogError(
+ string.Format("[{0}]: {1} caught during window call.\nMessage:\n{2}\nStackTrace:\n{3}",
+ func.Target.GetType().Name,
+ ex.GetType().Name,
+ ex.Message,
+ ex.StackTrace
+ ));
}
};
}
--- 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";
@@ -142,7 +142,7 @@
if (_selectedVessel != v)
{
_selectedVessel = v; //set clicked vessel as selected_vessel
- this._Active.value = true; //turn bool on to open the window if closed
+ this.toggleActive = true; //turn bool on to open the window if closed
}
else
{