Added SimManager.HardReset calls to both Awake()s.
--- a/VOIDFlightMaster.cs
+++ b/VOIDFlightMaster.cs
@@ -49,6 +49,7 @@
Tools.PostDebugMessage ("VOIDFlightMaster: Waking up.");
this.Core = (VOID_Core)VOID_Core.Instance;
this.Core.ResetGUI ();
+ SimManager.HardReset();
Tools.PostDebugMessage ("VOIDFlightMaster: Awake.");
}
@@ -115,6 +116,7 @@
Tools.PostDebugMessage ("VOIDEditorMaster: Waking up.");
this.Core = VOID_EditorCore.Instance;
this.Core.ResetGUI ();
+ SimManager.HardReset();
Tools.PostDebugMessage ("VOIDEditorMaster: Awake.");
}
--- a/VOID_DataValue.cs
+++ b/VOID_DataValue.cs
@@ -108,6 +108,7 @@
internal interface IVOID_NumericValue
{
+ double ToDouble();
string ToString(string format);
string ToSIString(int digits, int MinMagnitude, int MaxMagnitude);
}
@@ -116,11 +117,20 @@
{
public VOID_NumValue(string Label, Func<T> ValueFunc, string Units = "") : base(Label, ValueFunc, Units) {}
+ public abstract double ToDouble();
public abstract string ToString(string Format);
public abstract string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue);
public abstract string ValueUnitString(string format);
- public abstract string ValueUnitString(ushort digits);
+
+ public virtual string ValueUnitString(ushort digits) {
+ return Tools.MuMech_ToSI(this.ToDouble(), digits) + this.Units;
+ }
+
+ public virtual string ValueUnitString(ushort digits, int MinMagnitude, int MaxMagnitude)
+ {
+ return Tools.MuMech_ToSI(this.ToDouble(), digits, MinMagnitude, MaxMagnitude) + this.Units;
+ }
public virtual void DoGUIHorizontal(string format)
{
@@ -136,23 +146,43 @@
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label(this.Label + ":", GUILayout.ExpandWidth(true));
GUILayout.FlexibleSpace();
- GUILayout.Label(this.ValueUnitString(digits), GUILayout.ExpandWidth(false));
if (precisionButton)
{
- if (GUILayout.Button ("P"))
+ float magnitude = (float)Math.Log10(Math.Abs(this.ToDouble()));
+ GUILayout.Label(this.ValueUnitString(3, int.MinValue, (int)magnitude - digits), GUILayout.ExpandWidth(false));
+ if (GUILayout.Button(digits.ToString()))
{
- digits = (ushort)((digits + 3) % 15);
+ float magLimit = Math.Max(magnitude, 6f);
+ magLimit = (float)Math.Ceiling(magLimit / 3f) * 3f;
+ if (Event.current.button == 0)
+ {
+ digits = (ushort)((digits + 3) % (int)magLimit);
+ }
+ else if (Event.current.button == 1)
+ {
+ digits = (ushort)((digits - 3) % (int)magLimit);
+ }
}
}
+ else
+ {
+ GUILayout.Label(this.ValueUnitString(digits), GUILayout.ExpandWidth(false));
+ }
GUILayout.EndHorizontal();
return digits;
}
+
}
public class VOID_DoubleValue : VOID_NumValue<double>, IVOID_NumericValue
{
public VOID_DoubleValue(string Label, Func<double> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
+
+ public override double ToDouble ()
+ {
+ return this.Value;
+ }
public override string ToString(string format)
{
@@ -168,10 +198,6 @@
return this.Value.ToString(format) + this.Units;
}
- public override string ValueUnitString(ushort digits) {
- return Tools.MuMech_ToSI(this.Value, digits) + this.Units;
- }
-
public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
{
return string.Format (
@@ -184,15 +210,16 @@
public class VOID_FloatValue : VOID_NumValue<float>, IVOID_NumericValue
{
public VOID_FloatValue(string Label, Func<float> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
-
+
+ public override double ToDouble ()
+ {
+ return (double)this.Value;
+ }
+
public override string ValueUnitString(string format) {
return this.Value.ToString(format) + this.Units;
}
- public override string ValueUnitString(ushort digits) {
- return Tools.MuMech_ToSI((double)this.Value, digits) + this.Units;
- }
-
public override string ToString(string format)
{
return string.Format (
@@ -215,15 +242,16 @@
public class VOID_IntValue : VOID_NumValue<int>, IVOID_NumericValue
{
public VOID_IntValue(string Label, Func<int> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
-
+
+ public override double ToDouble ()
+ {
+ return (double)this.Value;
+ }
+
public override string ValueUnitString(string format) {
return this.Value.ToString(format) + this.Units;
}
- public override string ValueUnitString(ushort digits) {
- return Tools.MuMech_ToSI((double)this.Value, digits) + this.Units;
- }
-
public override string ToString(string format)
{
return string.Format (
--- a/VOID_SurfAtmo.cs
+++ b/VOID_SurfAtmo.cs
@@ -26,6 +26,102 @@
{
public class VOID_SurfAtmo : VOID_WindowModule
{
+ [AVOID_SaveValue("precisionValues")]
+ protected long _precisionValues = 230584300921369395;
+ protected IntCollection precisionValues;
+
+ protected VOID_DoubleValue trueAltitude = new VOID_DoubleValue(
+ "Altitude (true)",
+ delegate()
+ {
+ double alt_true = VOID_Core.Instance.vessel.orbit.altitude - VOID_Core.Instance.vessel.terrainAltitude;
+ // HACK: This assumes that on worlds with oceans, all water is fixed at 0 m,
+ // and water covers the whole surface at 0 m.
+ if (VOID_Core.Instance.vessel.terrainAltitude < 0 && VOID_Core.Instance.vessel.mainBody.ocean )
+ alt_true = VOID_Core.Instance.vessel.orbit.altitude;
+ return alt_true;
+ },
+ "m"
+ );
+
+ protected VOID_StrValue surfLatitude = new VOID_StrValue(
+ "Latitude",
+ new Func<string> (() => Tools.GetLatitudeString(VOID_Core.Instance.vessel))
+ );
+
+ protected VOID_StrValue surfLongitude = new VOID_StrValue(
+ "Longitude",
+ new Func<string> (() => Tools.GetLongitudeString(VOID_Core.Instance.vessel))
+ );
+
+ protected VOID_StrValue vesselHeading = new VOID_StrValue(
+ "Heading",
+ delegate()
+ {
+ double heading = Tools.MuMech_get_heading(VOID_Core.Instance.vessel);
+ string cardinal = Tools.get_heading_text(heading);
+
+ return string.Format(
+ "{0}° {1}",
+ heading.ToString("F2"),
+ cardinal
+ );
+ }
+ );
+
+ protected VOID_DoubleValue terrainElevation = new VOID_DoubleValue(
+ "Terrain elevation",
+ new Func<double> (() => VOID_Core.Instance.vessel.terrainAltitude),
+ "m"
+ );
+
+ protected VOID_DoubleValue surfVelocity = new VOID_DoubleValue(
+ "Surface velocity",
+ new Func<double> (() => VOID_Core.Instance.vessel.srf_velocity.magnitude),
+ "m/s"
+ );
+
+ protected VOID_DoubleValue vertVelocity = new VOID_DoubleValue(
+ "Vertical speed",
+ new Func<double> (() => VOID_Core.Instance.vessel.verticalSpeed),
+ "m/s"
+ );
+
+ protected VOID_DoubleValue horzVelocity = new VOID_DoubleValue(
+ "Horizontal speed",
+ new Func<double> (() => VOID_Core.Instance.vessel.horizontalSrfSpeed),
+ "m/s"
+ );
+
+ protected VOID_FloatValue temperature = new VOID_FloatValue(
+ "Temperature",
+ new Func<float> (() => VOID_Core.Instance.vessel.flightIntegrator.getExternalTemperature()),
+ "°C"
+ );
+
+ protected VOID_DoubleValue atmDensity = new VOID_DoubleValue (
+ "Atmosphere Density",
+ new Func<double> (() => VOID_Core.Instance.vessel.atmDensity * 1000f),
+ "g/m³"
+ );
+
+ protected VOID_DoubleValue atmPressure = new VOID_DoubleValue (
+ "Pressure",
+ new Func<double> (() => VOID_Core.Instance.vessel.staticPressure),
+ "atm"
+ );
+
+ protected VOID_FloatValue atmLimit = new VOID_FloatValue(
+ "Atmosphere Limit",
+ new Func<float> (() => VOID_Core.Instance.vessel.mainBody.maxAtmosphereAltitude),
+ "m"
+ );
+
+ protected VOID_StrValue currBiome = new VOID_StrValue(
+ "Biome",
+ new Func<string> (() => Tools.Toadicus_GetAtt(VOID_Core.Instance.vessel).name)
+ );
+
public VOID_SurfAtmo()
{
this._Name = "Surface & Atmospheric Information";
@@ -36,79 +132,61 @@
public override void ModuleWindow(int _)
{
+ base.ModuleWindow (_);
+
+ int idx = 0;
+
GUILayout.BeginVertical();
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Altitude (true):");
- double alt_true = vessel.orbit.altitude - vessel.terrainAltitude;
- // HACK: This assumes that on worlds with oceans, all water is fixed at 0 m, and water covers the whole surface at 0 m.
- if (vessel.terrainAltitude < 0 && vessel.mainBody.ocean ) alt_true = vessel.orbit.altitude;
- GUILayout.Label(Tools.MuMech_ToSI(alt_true) + "m", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal ();
+ this.precisionValues [idx] = this.trueAltitude.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Latitude:");
- GUILayout.Label(Tools.GetLatitudeString(vessel), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.surfLatitude.DoGUIHorizontal ();
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Longitude:");
- GUILayout.Label(Tools.GetLongitudeString(vessel), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.surfLongitude.DoGUIHorizontal ();
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Heading:");
- GUILayout.Label(Tools.MuMech_get_heading(vessel).ToString("F2") + "° " + Tools.get_heading_text(Tools.MuMech_get_heading(vessel)), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.vesselHeading.DoGUIHorizontal ();
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Terrain elevation:");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.terrainAltitude) + "m", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.precisionValues [idx] = this.terrainElevation.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Surface velocity:");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.srf_velocity.magnitude) + "m/s", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.precisionValues [idx] = this.surfVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Vertical speed:");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.verticalSpeed) + "m/s", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.precisionValues [idx] = this.vertVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Horizontal speed:");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.horizontalSrfSpeed) + "m/s", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.precisionValues [idx] = this.horzVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Temperature:");
- GUILayout.Label(vessel.flightIntegrator.getExternalTemperature().ToString("F2") + "° C", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.temperature.DoGUIHorizontal ("F2");
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Atmosphere density:");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.atmDensity * 1000) + "g/m³", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.atmDensity.DoGUIHorizontal (3);
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Pressure:");
- GUILayout.Label(vessel.staticPressure.ToString("F2") + " atms", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.atmPressure.DoGUIHorizontal ("F2");
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Atmosphere limit:");
- GUILayout.Label("≈ " + Tools.MuMech_ToSI(vessel.mainBody.maxAtmosphereAltitude) + "m", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.precisionValues [idx] = this.atmLimit.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
// Toadicus edit: added Biome
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Biome:");
- GUILayout.Label(Tools.Toadicus_GetAtt(vessel).name, VOID_Core.Instance.LabelStyles["right"]);
- GUILayout.EndHorizontal();
+ this.currBiome.DoGUIHorizontal ();
GUILayout.EndVertical();
GUI.DragWindow();
}
+
+ public override void LoadConfig ()
+ {
+ base.LoadConfig ();
+
+ this.precisionValues = new IntCollection (4, this._precisionValues);
+ }
+
+ public override void _SaveToConfig (KSP.IO.PluginConfiguration config)
+ {
+ this._precisionValues = this.precisionValues.collection;
+
+ base._SaveToConfig (config);
+ }
}
}
--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -22,6 +22,7 @@
using System;
using System.Collections.Generic;
using UnityEngine;
+using Engineer.VesselSimulator;
namespace VOID
{
@@ -66,9 +67,11 @@
"DeltaV (Current Stage)",
delegate()
{
- if (Engineer.VesselSimulator.SimManager.Instance.Stages == null)
+ if (SimManager.Instance.Stages == null ||
+ SimManager.Instance.Stages.Length <= Staging.lastStage
+ )
return double.NaN;
- return Engineer.VesselSimulator.SimManager.Instance.Stages[Staging.lastStage].deltaV;
+ return SimManager.Instance.Stages[Staging.lastStage].deltaV;
},
"m/s"
);
@@ -77,9 +80,9 @@
"DeltaV (Total)",
delegate()
{
- if (Engineer.VesselSimulator.SimManager.Instance.Stages == null)
+ if (SimManager.Instance.Stages == null)
return double.NaN;
- return Engineer.VesselSimulator.SimManager.Instance.LastStage.totalDeltaV;
+ return SimManager.Instance.LastStage.totalDeltaV;
},
"m/s"
);
@@ -94,11 +97,11 @@
"Thrust (curr/max)",
delegate()
{
- if (Engineer.VesselSimulator.SimManager.Instance.Stages == null)
+ if (SimManager.Instance.Stages == null)
return "N/A";
- double currThrust = Engineer.VesselSimulator.SimManager.Instance.LastStage.actualThrust;
- double maxThrust = Engineer.VesselSimulator.SimManager.Instance.LastStage.thrust;
+ double currThrust = SimManager.Instance.LastStage.actualThrust;
+ double maxThrust = SimManager.Instance.LastStage.thrust;
return string.Format(
"{0} / {1}",
@@ -112,11 +115,11 @@
"T:W (curr/max)",
delegate()
{
- if (Engineer.VesselSimulator.SimManager.Instance.Stages == null)
+ if (SimManager.Instance.Stages == null)
return "N/A";
- double currThrust = Engineer.VesselSimulator.SimManager.Instance.LastStage.actualThrust;
- double maxThrust = Engineer.VesselSimulator.SimManager.Instance.LastStage.thrust;
+ double currThrust = SimManager.Instance.LastStage.actualThrust;
+ double maxThrust = SimManager.Instance.LastStage.thrust;
double mass = VOID_Core.Instance.vessel.GetTotalMass();
double gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
Math.Pow(
@@ -137,10 +140,10 @@
"Max T:W @ surface",
delegate()
{
- if (Engineer.VesselSimulator.SimManager.Instance.Stages == null)
+ if (SimManager.Instance.Stages == null)
return double.NaN;
- double maxThrust = Engineer.VesselSimulator.SimManager.Instance.LastStage.thrust;
+ double maxThrust = SimManager.Instance.LastStage.thrust;
double mass = VOID_Core.Instance.vessel.GetTotalMass();
double gravity = (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
@@ -165,10 +168,10 @@
if ((TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate))
{
- Engineer.VesselSimulator.SimManager.Instance.RequestSimulation();
+ SimManager.Instance.RequestSimulation();
}
- Engineer.VesselSimulator.Stage[] stages = Engineer.VesselSimulator.SimManager.Instance.Stages;
+ Stage[] stages = SimManager.Instance.Stages;
GUILayout.BeginVertical();
@@ -185,15 +188,9 @@
this.resourceMass.DoGUIHorizontal ("F1");
- if (stages != null) {
- if (stages.Length > Staging.lastStage) {
- this.stageDeltaV.DoGUIHorizontal (3, false);
- }
-
- if (stages.Length > 0) {
- this.totalDeltaV.DoGUIHorizontal (3, false);
- }
- }
+ this.stageDeltaV.DoGUIHorizontal (3, false);
+
+ this.totalDeltaV.DoGUIHorizontal (3, false);
this.mainThrottle.DoGUIHorizontal ("F0");