VOID_DataValue: Removed an extraneous debugging label.
--- 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.");
}
@@ -68,13 +69,6 @@
}
this.Core.Update ();
-
- if (this.Core.vessel != null)
- {
- SimManager.Instance.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
- Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
- SimManager.Instance.TryStartSimulation();
- }
if (this.Core.factoryReset)
{
@@ -115,6 +109,7 @@
Tools.PostDebugMessage ("VOIDEditorMaster: Waking up.");
this.Core = VOID_EditorCore.Instance;
this.Core.ResetGUI ();
+ SimManager.HardReset();
Tools.PostDebugMessage ("VOIDEditorMaster: Awake.");
}
--- a/VOID_CBInfoBrowser.cs
+++ b/VOID_CBInfoBrowser.cs
@@ -102,7 +102,7 @@
//}
//toggle for orbital info chunk
- if (GUILayout.Button("Orbital Characteristics", GUILayout.ExpandWidth(true))) toggleOrbital = !toggleOrbital;
+ if (GUILayout.Button("Orbital Characteristics", GUILayout.ExpandWidth(true))) toggleOrbital.value = !toggleOrbital;
if (toggleOrbital)
{
@@ -156,7 +156,7 @@
}
//toggle for physical info chunk
- if (GUILayout.Button("Physical Characteristics", GUILayout.ExpandWidth(true))) togglePhysical = !togglePhysical;
+ if (GUILayout.Button("Physical Characteristics", GUILayout.ExpandWidth(true))) togglePhysical.value = !togglePhysical;
if (togglePhysical)
{
--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -21,9 +21,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Reflection;
using KSP;
using UnityEngine;
+using Engineer.VesselSimulator;
namespace VOID
{
@@ -68,7 +68,7 @@
* Fields
* */
protected string VoidName = "VOID";
- protected string VoidVersion = "0.9.13";
+ protected string VoidVersion = "0.9.15";
protected bool _factoryReset = false;
@@ -135,10 +135,12 @@
public float saveTimer = 0;
+ protected string defaultSkin = "KSP window 2";
+
[AVOID_SaveValue("defaultSkin")]
- protected VOID_SaveValue<string> defaultSkin = "KSP window 2";
- protected int _skinIdx = int.MinValue;
- protected List<GUISkin> skin_list;
+ protected VOID_SaveValue<string> _skinName;
+ protected Dictionary<string, GUISkin> skin_list;
+ protected List<string> skinNames;
protected string[] forbiddenSkins =
{
"PlaqueDialogSkin",
@@ -176,11 +178,11 @@
{
get
{
- if (this.skin_list == null || this._skinIdx < 0 || this._skinIdx > this.skin_list.Count)
+ if (!this.skinsLoaded || this._skinName == null)
{
return AssetBase.GetGUISkin(this.defaultSkin);
}
- return this.skin_list[this._skinIdx];
+ return this.skin_list[this._skinName];
}
}
@@ -243,10 +245,12 @@
{
this._Name = "VOID Core";
- this._Active = true;
+ this._Active.value = true;
this.VOIDIconOn = GameDatabase.Instance.GetTexture (this.VOIDIconOnPath, false);
this.VOIDIconOff = GameDatabase.Instance.GetTexture (this.VOIDIconOffPath, false);
+
+ this._skinName = this.defaultSkin;
this.LoadConfig ();
}
@@ -333,6 +337,13 @@
{
this.Preload_BeforeUpdate ();
+ if (this.vessel != null)
+ {
+ SimManager.Instance.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
+ Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
+ SimManager.Instance.TryStartSimulation();
+ }
+
if (!this.guiRunning)
{
this.StartGUI ();
@@ -396,10 +407,20 @@
protected void LoadSkins()
{
+ Tools.PostDebugMessage ("AssetBase has skins: \n" +
+ string.Join("\n\t", AssetBase.FindObjectsOfTypeIncludingAssets (
+ typeof(GUISkin))
+ .Select(s => s.ToString())
+ .ToArray()
+ )
+ );
+
this.skin_list = AssetBase.FindObjectsOfTypeIncludingAssets(typeof(GUISkin))
.Where(s => !this.forbiddenSkins.Contains(s.name))
.Select(s => s as GUISkin)
- .ToList();
+ .GroupBy(s => s.name)
+ .Select(g => g.First())
+ .ToDictionary(s => s.name);
Tools.PostDebugMessage(string.Format(
"{0}: loaded {1} GUISkins.",
@@ -407,9 +428,12 @@
this.skin_list.Count
));
- if (this._skinIdx == int.MinValue)
- {
- this._skinIdx = this.skin_list.IndexOf(this.Skin);
+ this.skinNames = this.skin_list.Keys.ToList();
+ this.skinNames.Sort();
+
+ if (this._skinName == null || !this.skinNames.Contains(this._skinName))
+ {
+ this._skinName = this.defaultSkin;
Tools.PostDebugMessage(string.Format(
"{0}: resetting _skinIdx to default.",
this.GetType().Name
@@ -419,7 +443,7 @@
Tools.PostDebugMessage(string.Format(
"{0}: _skinIdx = {1}.",
this.GetType().Name,
- this._skinIdx.ToString()
+ this._skinName.ToString()
));
this.skinsLoaded = true;
@@ -427,6 +451,9 @@
protected void LoadGUIStyles()
{
+ this.LabelStyles["link"] = new GUIStyle(GUI.skin.label);
+ this.LabelStyles["link"].fontStyle = FontStyle.Bold;
+
this.LabelStyles["center"] = new GUIStyle(GUI.skin.label);
this.LabelStyles["center"].normal.textColor = Color.white;
this.LabelStyles["center"].alignment = TextAnchor.UpperCenter;
@@ -439,6 +466,10 @@
this.LabelStyles["right"] = new GUIStyle(GUI.skin.label);
this.LabelStyles["right"].normal.textColor = Color.white;
this.LabelStyles["right"].alignment = TextAnchor.UpperRight;
+
+ this.LabelStyles ["red"] = new GUIStyle(GUI.skin.label);
+ this.LabelStyles ["red"].normal.textColor = Color.red;
+ this.LabelStyles ["red"].alignment = TextAnchor.MiddleCenter;
this.GUIStylesLoaded = true;
}
@@ -488,7 +519,7 @@
{
string str = "ON";
if (togglePower) str = "OFF";
- if (GUILayout.Button("Power " + str)) togglePower = !togglePower;
+ if (GUILayout.Button("Power " + str)) togglePower.value = !togglePower;
}
if (togglePower || HighLogic.LoadedSceneIsEditor)
@@ -501,13 +532,10 @@
}
else
{
- GUIStyle label_txt_red = new GUIStyle(GUI.skin.label);
- label_txt_red.normal.textColor = Color.red;
- label_txt_red.alignment = TextAnchor.MiddleCenter;
- GUILayout.Label("-- POWER LOST --", label_txt_red);
- }
-
- this.configWindowMinimized = !GUILayout.Toggle (!this.configWindowMinimized, "Configuration");
+ GUILayout.Label("-- POWER LOST --", this.LabelStyles["red"]);
+ }
+
+ this.configWindowMinimized.value = !GUILayout.Toggle (!this.configWindowMinimized, "Configuration");
GUILayout.EndVertical();
GUI.DragWindow();
@@ -525,9 +553,13 @@
public override void DrawConfigurables()
{
+ int skinIdx;
+
+ GUIContent _content;
+
if (HighLogic.LoadedSceneIsFlight)
{
- this.consumeResource = GUILayout.Toggle (this.consumeResource, "Consume Resources");
+ this.consumeResource.value = GUILayout.Toggle (this.consumeResource, "Consume Resources");
this.VOIDIconLocked = GUILayout.Toggle (this.VOIDIconLocked, "Lock Icon Position");
}
@@ -536,24 +568,36 @@
GUILayout.Label("Skin:", GUILayout.ExpandWidth(false));
- GUIContent _content = new GUIContent();
+ _content = new GUIContent();
+
+ if (skinNames.Contains(this._skinName))
+ {
+ skinIdx = skinNames.IndexOf(this._skinName);
+ }
+ else if (skinNames.Contains(this.defaultSkin))
+ {
+ skinIdx = skinNames.IndexOf(this.defaultSkin);
+ }
+ else
+ {
+ skinIdx = 0;
+ }
_content.text = "◄";
_content.tooltip = "Select previous skin";
if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
{
- this._skinIdx--;
- if (this._skinIdx < 0) this._skinIdx = skin_list.Count - 1;
+ skinIdx--;
+ if (skinIdx < 0) skinIdx = skinNames.Count - 1;
Tools.PostDebugMessage (string.Format (
"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
this.GetType().Name,
- this._skinIdx,
+ this._skinName,
this.skin_list.Count
));
}
- string skin_name = skin_list[this._skinIdx].name;
- _content.text = skin_name;
+ _content.text = this.Skin.name;
_content.tooltip = "Current skin";
GUILayout.Label(_content, this.LabelStyles["center"], GUILayout.ExpandWidth(true));
@@ -561,19 +605,19 @@
_content.tooltip = "Select next skin";
if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
{
- this._skinIdx++;
- if (this._skinIdx >= skin_list.Count) this._skinIdx = 0;
+ skinIdx++;
+ if (skinIdx >= skinNames.Count) skinIdx = 0;
Tools.PostDebugMessage (string.Format (
"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
this.GetType().Name,
- this._skinIdx,
+ this._skinName,
this.skin_list.Count
));
}
- if (this.Skin.name != this.defaultSkin)
- {
- this.defaultSkin = this.Skin.name;
+ if (this._skinName != skinNames[skinIdx])
+ {
+ this._skinName = skinNames[skinIdx];
}
GUILayout.EndHorizontal();
@@ -682,7 +726,7 @@
if (this.togglePower) this.VOIDIconTexture = this.VOIDIconOn; //or on if power_toggle==true
if (GUI.Button(VOIDIconPos, VOIDIconTexture, new GUIStyle()) && this.VOIDIconLocked)
{
- this.mainGuiMinimized = !this.mainGuiMinimized;
+ this.mainGuiMinimized.value = !this.mainGuiMinimized;
}
if (!this.mainGuiMinimized)
--- a/VOID_DataLogger.cs
+++ b/VOID_DataLogger.cs
@@ -30,19 +30,19 @@
/*
* Fields
* */
- protected bool stopwatch1_running = false;
-
- protected bool csv_logging = false;
- protected bool first_write = true;
-
- protected double stopwatch1 = 0;
-
- protected string csv_log_interval_str = "0.5";
+ protected bool stopwatch1_running;
+
+ protected bool csv_logging;
+ protected bool first_write;
+
+ protected double stopwatch1;
+
+ protected string csv_log_interval_str;
protected float csv_log_interval;
- protected double csvWriteTimer = 0;
- protected double csvCollectTimer = 0;
+ protected double csvWriteTimer;
+ protected double csvCollectTimer;
protected List<string> csvList = new List<string>();
@@ -57,6 +57,17 @@
public VOID_DataLogger()
{
this._Name = "CSV Data Logger";
+
+ this.stopwatch1_running = false;
+
+ this.csv_logging = false;
+ this.first_write = true;
+
+ this.stopwatch1 = 0;
+ this.csv_log_interval_str = "0.5";
+
+ this.csvWriteTimer = 0;
+ this.csvCollectTimer = 0;
this.WindowPos.x = Screen.width - 520;
this.WindowPos.y = 85;
--- 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(int digits) {
+ return Tools.MuMech_ToSI(this.ToDouble(), digits) + this.Units;
+ }
+
+ public virtual string ValueUnitString(int digits, int MinMagnitude, int MaxMagnitude)
+ {
+ return Tools.MuMech_ToSI(this.ToDouble(), digits, MinMagnitude, MaxMagnitude) + this.Units;
+ }
public virtual void DoGUIHorizontal(string format)
{
@@ -131,20 +141,58 @@
GUILayout.EndHorizontal ();
}
- public virtual ushort DoGUIHorizontal(ushort digits, bool precisionButton = true)
- {
+ public virtual int DoGUIHorizontal(int digits, bool precisionButton = true)
+ {
+ if (precisionButton)
+ {
+ return this.DoGUIHorizontalPrec(digits);
+ }
+
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label(this.Label + ":", GUILayout.ExpandWidth(true));
GUILayout.FlexibleSpace();
GUILayout.Label(this.ValueUnitString(digits), GUILayout.ExpandWidth(false));
- if (precisionButton)
+ GUILayout.EndHorizontal();
+
+ return digits;
+ }
+
+ public virtual int DoGUIHorizontalPrec(int digits)
+ {
+ float magnitude;
+ float magLimit;
+
+ magnitude = (float)Math.Log10(Math.Abs(this.ToDouble()));
+
+ magLimit = Mathf.Max(magnitude, 6f);
+ magLimit = Mathf.Round((float)Math.Ceiling(magLimit / 3f) * 3f);
+
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(this.Label + "ⁱ:", GUILayout.ExpandWidth(true));
+ GUILayout.FlexibleSpace();
+
+ GUILayout.Label(this.ValueUnitString(3, int.MinValue, (int)magnitude - digits), GUILayout.ExpandWidth(false));
+ GUILayout.EndHorizontal();
+
+ if (Event.current.type == EventType.mouseUp)
{
- if (GUILayout.Button ("P"))
+ Rect lastRect = GUILayoutUtility.GetLastRect();
+ if (lastRect.Contains(Event.current.mousePosition))
{
- digits = (ushort)((digits + 3) % 15);
+ if (Event.current.button == 0)
+ {
+ digits = (digits + 3) % (int)magLimit;
+ }
+ else if (Event.current.button == 1)
+ {
+ digits = (digits - 3) % (int)magLimit;
+ if (digits < 0)
+ {
+ digits = (int)magLimit - 3;
+ }
+ }
}
}
- GUILayout.EndHorizontal();
return digits;
}
@@ -153,6 +201,11 @@
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 +221,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,13 +233,14 @@
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)
@@ -215,13 +265,14 @@
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)
--- a/VOID_EditorHUD.cs
+++ b/VOID_EditorHUD.cs
@@ -68,7 +68,7 @@
{
this._Name = "Heads-Up Display";
- this._Active = true;
+ this._Active.value = true;
this.textColors.Add(Color.green);
this.textColors.Add(Color.black);
--- a/VOID_HUD.cs
+++ b/VOID_HUD.cs
@@ -37,8 +37,6 @@
protected List<Color> textColors = new List<Color>();
- protected GUIStyle labelStyle;
-
/*
* Properties
* */
@@ -67,7 +65,7 @@
{
this._Name = "Heads-Up Display";
- this._Active = true;
+ this._Active.value = true;
this.textColors.Add(Color.green);
this.textColors.Add(Color.black);
@@ -79,8 +77,8 @@
this.textColors.Add(Color.cyan);
this.textColors.Add(Color.magenta);
- this.labelStyle = new GUIStyle ();
- this.labelStyle.normal.textColor = this.textColors [this.ColorIndex];
+ VOID_Core.Instance.LabelStyles["hud"] = new GUIStyle();
+ VOID_Core.Instance.LabelStyles["hud"].normal.textColor = this.textColors [this.ColorIndex];
Tools.PostDebugMessage ("VOID_HUD: Constructed.");
}
@@ -91,7 +89,7 @@
if (VOID_Core.Instance.powerAvailable)
{
- labelStyle.normal.textColor = textColors [ColorIndex];
+ VOID_Core.Instance.LabelStyles["hud"].normal.textColor = textColors [ColorIndex];
GUI.Label (
new Rect ((Screen.width * .2083f), 0, 300f, 70f),
@@ -103,7 +101,7 @@
" ETA " + Tools.ConvertInterval (vessel.orbit.timeToPe) +
"\nInc: " + vessel.orbit.inclination.ToString ("F3") + "°" +
"\nPrimary: " + vessel.mainBody.bodyName,
- labelStyle);
+ VOID_Core.Instance.LabelStyles["hud"]);
// Toadicus edit: Added "Biome: " line to surf/atmo HUD
GUI.Label (
new Rect ((Screen.width * .625f), 0, 300f, 90f),
@@ -116,13 +114,13 @@
"\nHdg: " + Tools.MuMech_get_heading (vessel).ToString ("F2") + "° " +
Tools.get_heading_text (Tools.MuMech_get_heading (vessel)) +
"\nBiome: " + Tools.Toadicus_GetAtt (vessel).name,
- labelStyle);
+ VOID_Core.Instance.LabelStyles["hud"]);
}
else
{
- labelStyle.normal.textColor = Color.red;
- GUI.Label (new Rect ((Screen.width * .2083f), 0, 300f, 70f), "-- POWER LOST --", labelStyle);
- GUI.Label (new Rect ((Screen.width * .625f), 0, 300f, 70f), "-- POWER LOST --", labelStyle);
+ VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
+ GUI.Label (new Rect ((Screen.width * .2083f), 0, 300f, 70f), "-- POWER LOST --", VOID_Core.Instance.LabelStyles["hud"]);
+ GUI.Label (new Rect ((Screen.width * .625f), 0, 300f, 70f), "-- POWER LOST --", VOID_Core.Instance.LabelStyles["hud"]);
}
}
--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -50,7 +50,7 @@
}
set
{
- this._Active = value;
+ this._Active.value = value;
}
}
@@ -129,6 +129,8 @@
AVOID_SaveValue attr = attrs.FirstOrDefault () as AVOID_SaveValue;
string fieldName = string.Format("{0}_{1}", this.GetType().Name, attr.Name);
+
+ Tools.PostDebugMessage(string.Format("{0}: Loading field {1}.", this.GetType().Name, fieldName));
object fieldValue = field.GetValue(this);
@@ -256,6 +258,8 @@
public override void DrawGUI()
{
+ GUI.skin = VOID_Core.Instance.Skin;
+
Rect _Pos = this.WindowPos;
_Pos = GUILayout.Window(
--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -162,34 +162,34 @@
this.primaryName.DoGUIHorizontal ();
- this.precisionValues [idx] = this.orbitAltitude.DoGUIHorizontal (this.precisionValues [idx]);
- idx++;
-
- this.precisionValues [idx] = this.orbitVelocity.DoGUIHorizontal (this.precisionValues [idx]);
- idx++;
-
- this.precisionValues [idx] = this.orbitApoAlt.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)this.orbitAltitude.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ this.precisionValues [idx]= (ushort)this.orbitVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ this.precisionValues [idx]= (ushort)this.orbitApoAlt.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
this.timeToApo.DoGUIHorizontal();
- this.precisionValues [idx] = this.oribtPeriAlt.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)this.oribtPeriAlt.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
this.timeToPeri.DoGUIHorizontal();
this.orbitInclination.DoGUIHorizontal("F3");
- this.precisionValues [idx] = this.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
- idx++;
-
- this.toggleExtended = GUILayout.Toggle(this.toggleExtended, "Extended info");
+ this.precisionValues [idx]= (ushort)this.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ this.toggleExtended.value = GUILayout.Toggle(this.toggleExtended, "Extended info");
if (this.toggleExtended)
{
this.orbitPeriod.DoGUIHorizontal();
- this.precisionValues [idx] = this.semiMajorAxis.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)this.semiMajorAxis.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
this.eccentricity.DoGUIHorizontal("F4");
--- a/VOID_Rendezvous.cs
+++ b/VOID_Rendezvous.cs
@@ -114,7 +114,7 @@
}
}
- untoggleRegisterInfo = GUILayout.Toggle(untoggleRegisterInfo, "Hide Vessel Register Info");
+ untoggleRegisterInfo.value = GUILayout.Toggle(untoggleRegisterInfo, "Hide Vessel Register Info");
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label(" ", GUILayout.ExpandWidth(true));
--- a/VOID_SaveValue.cs
+++ b/VOID_SaveValue.cs
@@ -30,6 +30,28 @@
private T _value;
private Type _type;
+ private VOID_Core Core
+ {
+ get
+ {
+ if (HighLogic.LoadedSceneIsEditor)
+ {
+ if (VOID_EditorCore.Initialized)
+ {
+ return VOID_EditorCore.Instance;
+ }
+ }
+ else if (HighLogic.LoadedSceneIsFlight)
+ {
+ if (VOID_Core.Initialized)
+ {
+ return VOID_Core.Instance;
+ }
+ }
+ return null;
+ }
+ }
+
public T value
{
get
@@ -38,6 +60,20 @@
}
set
{
+ if (this.Core != null && !System.Object.Equals(this._value, value))
+ {
+ Tools.PostDebugMessage (string.Format (
+ "VOID: Dirtying config for type {0} in method {1}." +
+ "\n\t Old Value: {2}, New Value: {3}" +
+ "\n\t Object.Equals(New, Old): {4}",
+ this._type,
+ new System.Diagnostics.StackTrace().GetFrame(1).GetMethod(),
+ this._value,
+ value,
+ System.Object.Equals(this._value, value)
+ ));
+ this.Core.configDirty = true;
+ }
this._value = value;
}
}
@@ -46,6 +82,10 @@
{
get
{
+ if (this._type == null && this._value != null)
+ {
+ this._type = this._value.GetType ();
+ }
return this._type;
}
set
@@ -64,7 +104,7 @@
public void SetValue(object v)
{
- this._value = (T)v;
+ this.value = (T)v;
}
public static implicit operator T(VOID_SaveValue<T> v)
@@ -75,18 +115,8 @@
public static implicit operator VOID_SaveValue<T>(T v)
{
VOID_SaveValue<T> r = new VOID_SaveValue<T>();
+ r.type = v.GetType();
r.value = v;
- r.type = v.GetType();
-
- if (VOID_Core.Initialized)
- {
- VOID_Core.Instance.configDirty = true;
- }
-
- if (VOID_EditorCore.Initialized)
- {
- VOID_EditorCore.Instance.configDirty = true;
- }
return r;
}
--- 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]= (ushort)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]= (ushort)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]= (ushort)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]= (ushort)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]= (ushort)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]= (ushort)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_Transfer.cs
+++ b/VOID_Transfer.cs
@@ -27,9 +27,6 @@
{
public class VOID_Transfer : VOID_WindowModule
{
- [AVOID_SaveValue("toggleExtended")]
- protected VOID_SaveValue<bool> toggleExtended = false;
-
protected List<CelestialBody> selectedBodies = new List<CelestialBody>();
public VOID_Transfer()
--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -22,14 +22,12 @@
using System;
using System.Collections.Generic;
using UnityEngine;
+using Engineer.VesselSimulator;
namespace VOID
{
public class VOID_VesselInfo : VOID_WindowModule
{
- [AVOID_SaveValue("toggleExtended")]
- protected VOID_SaveValue<bool> toggleExtended = false;
-
protected VOID_DoubleValue geeForce = new VOID_DoubleValue(
"G-force",
new Func<double>(() => VOID_Core.Instance.vessel.geeForce),
@@ -66,9 +64,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 +77,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 +94,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 +112,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 +137,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 +165,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();
--- a/VOID_VesselRegister.cs
+++ b/VOID_VesselRegister.cs
@@ -133,7 +133,7 @@
if (_selectedVessel != v)
{
_selectedVessel = v; //set clicked vessel as selected_vessel
- this._Active = true; //turn bool on to open the window if closed
+ this._Active.value = true; //turn bool on to open the window if closed
}
else
{