VOID_DataValue: Added ValueUnitString() and DoGUIHorizontal() to the interface.
--- a/IntCollection.cs
+++ b/IntCollection.cs
@@ -22,7 +22,7 @@
namespace VOID
{
- public class IntCollection : IVOID_SaveValue
+ public class IntCollection
{
public static implicit operator long(IntCollection c)
{
@@ -34,14 +34,6 @@
public long collection { get; protected set; }
public ushort maxCount { get; protected set; }
public ushort wordLength { get; protected set; }
-
- public Type type { get { return typeof(long); } }
- public object AsType { get { return this.collection; } }
-
- public void SetValue(object v)
- {
- this.collection = (long)v;
- }
public IntCollection (ushort wordLength = 4, long initialCollection = 0)
{
--- a/VOID.csproj
+++ b/VOID.csproj
@@ -22,7 +22,7 @@
<ConsolePause>false</ConsolePause>
<CustomCommands>
<CustomCommands>
- <Command type="AfterBuild" command="xcopy /Y ${ProjectDir}\bin\Debug\*.dll ..\..\..\Games\KSP_win\GameData\VOID\Plugins\" workingdir="${ProjectDir}" externalConsole="True" />
+ <Command type="AfterBuild" command="/usr/bin/cp -fv ${ProjectDir}/bin/Debug/VOID.dll /mnt/games/ssd/KSP_linux/GameData/VOID/Plugins/" />
</CustomCommands>
</CustomCommands>
</PropertyGroup>
@@ -35,7 +35,7 @@
<DefineConstants>TRACE</DefineConstants>
<CustomCommands>
<CustomCommands>
- <Command type="AfterBuild" command="xcopy /Y ${ProjectDir}\bin\Release\*.dll ..\..\..\Games\KSP_win\GameData\VOID\Plugins\" workingdir="${ProjectDir}" externalConsole="True" />
+ <Command type="AfterBuild" command="/usr/bin/cp -fv ${ProjectDir}/bin/Release/VOID.dll /mnt/games/ssd/KSP_linux/GameData/VOID/Plugins/" />
</CustomCommands>
</CustomCommands>
</PropertyGroup>
@@ -59,18 +59,19 @@
<Compile Include="VOID_EditorCore.cs" />
<Compile Include="VOID_EditorHUD.cs" />
<Compile Include="IntCollection.cs" />
+ <Compile Include="VOID_DataValue.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp">
- <HintPath>..\..\..\Games\KSP_win\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
+ <HintPath>..\..\..\..\..\mnt\games-ssd\KSP_linux\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine">
- <HintPath>..\..\..\Games\KSP_win\KSP_Data\Managed\UnityEngine.dll</HintPath>
+ <HintPath>..\..\..\..\..\mnt\games-ssd\KSP_linux\KSP_Data\Managed\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System">
- <HintPath>..\..\..\Games\KSP_win\KSP_Data\Managed\System.dll</HintPath>
+ <HintPath>..\..\..\..\..\mnt\games-ssd\KSP_linux\KSP_Data\Managed\System.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
--- a/VOID_CBInfoBrowser.cs
+++ b/VOID_CBInfoBrowser.cs
@@ -207,89 +207,89 @@
private void body_OP_show_orbital_info(CelestialBody body)
{
//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label((body.orbit.ApA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(Tools.ConvertInterval(body.orbit.timeToAp), VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label((body.orbit.PeA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(Tools.ConvertInterval(body.orbit.timeToPe), VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label((body.orbit.semiMajorAxis / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(body.orbit.eccentricity.ToString("F4") + "", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(Tools.ConvertInterval(body.orbit.period), VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(Tools.ConvertInterval(body.rotationPeriod), VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label((body.orbit.orbitalSpeed / 1000).ToString("F2") + "km/s", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label((body.orbit.ApA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label(Tools.ConvertInterval(body.orbit.timeToAp), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label((body.orbit.PeA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label(Tools.ConvertInterval(body.orbit.timeToPe), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label((body.orbit.semiMajorAxis / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label(body.orbit.eccentricity.ToString("F4") + "", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label(Tools.ConvertInterval(body.orbit.period), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label(Tools.ConvertInterval(body.rotationPeriod), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label((body.orbit.orbitalSpeed / 1000).ToString("F2") + "km/s", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
//GUILayout.EndHorizontal();
//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
// Toadicus edit: convert mean anomaly into degrees.
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label((body.orbit.meanAnomaly * 180d / Math.PI).ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(body.orbit.trueAnomaly.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label((body.orbit.meanAnomaly * 180d / Math.PI).ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label(body.orbit.trueAnomaly.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
//GUILayout.EndHorizontal();
//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
// Toadicus edit: convert eccentric anomaly into degrees.
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label((body.orbit.eccentricAnomaly * 180d / Math.PI).ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(body.orbit.inclination.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(body.orbit.LAN.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(body.orbit.argumentOfPeriapsis.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label((body.orbit.eccentricAnomaly * 180d / Math.PI).ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label(body.orbit.inclination.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label(body.orbit.LAN.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label(body.orbit.argumentOfPeriapsis.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else
{
string body_tidally_locked = "No";
if (body.tidallyLocked) body_tidally_locked = "Yes";
- GUILayout.Label(body_tidally_locked, VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ GUILayout.Label(body_tidally_locked, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
}
//GUILayout.EndHorizontal();
}
@@ -297,35 +297,35 @@
private void body_OP_show_physical_info(CelestialBody body)
{
//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label((body.Radius / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(((Math.Pow((body.Radius), 2) * 4 * Math.PI) / 1000).ToString("0.00e+00") + "km²", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ GUILayout.Label((body.Radius / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(((Math.Pow((body.Radius), 2) * 4 * Math.PI) / 1000).ToString("0.00e+00") + "km²", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
//GUILayout.EndHorizontal();
//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
// divide by 1000 to convert m to km
- GUILayout.Label((((4d / 3) * Math.PI * Math.Pow(body.Radius, 3)) / 1000).ToString("0.00e+00") + "km³", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.Label(((4 / 3) * Math.PI * Math.Pow((vessel.mainBody.Radius / 1000), 3)).ToString(), txt_right, GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(body.Mass.ToString("0.00e+00") + "kg", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ GUILayout.Label((((4d / 3) * Math.PI * Math.Pow(body.Radius, 3)) / 1000).ToString("0.00e+00") + "km³", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.Label(((4 / 3) * Math.PI * Math.Pow((vessel.mainBody.Radius / 1000), 3)).ToString(), right, GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(body.Mass.ToString("0.00e+00") + "kg", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
//GUILayout.EndHorizontal();
double p = body.Mass / (Math.Pow(body.Radius, 3) * (4d / 3) * Math.PI);
//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(p.ToString("##,#") + "kg/m³", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(body.orbitingBodies.Count.ToString(), VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ GUILayout.Label(p.ToString("##,#") + "kg/m³", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ if (body.bodyName == "Sun") GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(body.orbitingBodies.Count.ToString(), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
//GUILayout.EndHorizontal();
//show # artificial satellites
@@ -336,28 +336,28 @@
}
//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(num_art_sats.ToString(), VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ GUILayout.Label(num_art_sats.ToString(), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
//GUILayout.EndHorizontal();
double g_ASL = (VOID_Core.Constant_G * body.Mass) / Math.Pow(body.Radius, 2);
//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(Tools.MuMech_ToSI(g_ASL) + "m/s²", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("≈ " + Tools.MuMech_ToSI(body.maxAtmosphereAltitude) + "m", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ GUILayout.Label(Tools.MuMech_ToSI(g_ASL) + "m/s²", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ //GUILayout.EndHorizontal();
+
+ //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label("≈ " + Tools.MuMech_ToSI(body.maxAtmosphereAltitude) + "m", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
//GUILayout.EndHorizontal();
//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
string O2 = "No";
if (body.atmosphereContainsOxygen == true) O2 = "Yes";
- GUILayout.Label(O2, VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ GUILayout.Label(O2, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
//GUILayout.EndHorizontal();
//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
string ocean = "No";
if (body.ocean == true) ocean = "Yes";
- GUILayout.Label(ocean, VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ GUILayout.Label(ocean, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
//GUILayout.EndHorizontal();
}
}
--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -68,7 +68,7 @@
* Fields
* */
protected string VoidName = "VOID";
- protected string VoidVersion = "0.9.11";
+ protected string VoidVersion = "0.9.13";
protected bool _factoryReset = false;
@@ -119,6 +119,11 @@
[AVOID_SaveValue("resourceRate")]
protected VOID_SaveValue<float> resourceRate = 0.2f;
+
+ [AVOID_SaveValue("updatePeriod")]
+ protected VOID_SaveValue<double> _updatePeriod = 1001f/15000f;
+ protected float _updateTimer = 0f;
+ protected string stringFrequency;
// Celestial Body Housekeeping
protected List<CelestialBody> _allBodies = new List<CelestialBody>();
@@ -215,6 +220,22 @@
}
}
+ public float updateTimer
+ {
+ get
+ {
+ return this._updateTimer;
+ }
+ }
+
+ public double updatePeriod
+ {
+ get
+ {
+ return this._updatePeriod;
+ }
+ }
+
/*
* Methods
* */
@@ -330,8 +351,8 @@
}
if (module.guiRunning && !module.toggleActive ||
!this.togglePower ||
- !HighLogic.LoadedSceneIsFlight
- || this.factoryReset
+ !HighLogic.LoadedSceneIsFlight ||
+ this.factoryReset
)
{
module.StopGUI();
@@ -344,6 +365,7 @@
}
this.CheckAndSave ();
+ this._updateTimer += Time.deltaTime;
}
public void FixedUpdate()
@@ -414,9 +436,9 @@
this.LabelStyles["center_bold"].alignment = TextAnchor.UpperCenter;
this.LabelStyles["center_bold"].fontStyle = FontStyle.Bold;
- this.LabelStyles["txt_right"] = new GUIStyle(GUI.skin.label);
- this.LabelStyles["txt_right"].normal.textColor = Color.white;
- this.LabelStyles["txt_right"].alignment = TextAnchor.UpperRight;
+ this.LabelStyles["right"] = new GUIStyle(GUI.skin.label);
+ this.LabelStyles["right"].normal.textColor = Color.white;
+ this.LabelStyles["right"].alignment = TextAnchor.UpperRight;
this.GUIStylesLoaded = true;
}
@@ -437,12 +459,6 @@
protected void CheckAndSave()
{
this.saveTimer += Time.deltaTime;
-
- Tools.PostDebugMessage (string.Format (
- "{0}: Checking if time to save; saveTimer: {1}",
- this.GetType ().Name,
- this.saveTimer
- ));
if (this.saveTimer > 2f)
{
@@ -562,6 +578,22 @@
GUILayout.EndHorizontal();
+ GUILayout.BeginHorizontal();
+ GUILayout.Label("Update Rate (Hz):");
+ if (this.stringFrequency == null)
+ {
+ 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;
+ double.TryParse(stringFrequency, out updateFreq);
+ this._updatePeriod = 1 / updateFreq;
+ }
+ GUILayout.EndHorizontal();
+
foreach (IVOID_Module mod in this.Modules)
{
mod.DrawConfigurables ();
@@ -577,6 +609,7 @@
return;
}
+ /*
Tools.PostDebugMessage(string.Format(
"Event.current.type: {0}" +
"\nthis.VOIDIconLocked: {1}" +
@@ -590,6 +623,7 @@
this.VOIDIconPos.value.xMax,
this.VOIDIconPos.value.yMax
));
+ */
if (!this.VOIDIconLocked &&
VOIDIconPos.value.Contains(Event.current.mousePosition)
@@ -672,7 +706,7 @@
}
}
- if (!this.configWindowMinimized)
+ if (!this.configWindowMinimized && !this.mainGuiMinimized)
{
Rect _configWindowPos = this.configWindowPos;
--- /dev/null
+++ b/VOID_DataValue.cs
@@ -1,1 +1,251 @@
-
+//
+// VOID_DataValue.cs
+//
+// Author:
+// toadicus <>
+//
+// Copyright (c) 2013 toadicus
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+using System;
+using UnityEngine;
+
+namespace VOID
+{
+ public interface IVOID_DataValue
+ {
+ void Refresh();
+ string ValueUnitString();
+ void DoGUIHorizontal();
+ }
+
+ public class VOID_DataValue<T> : IVOID_DataValue
+ {
+ /*
+ * Static Members
+ * */
+ public static implicit operator T(VOID_DataValue<T> v)
+ {
+ return (T)v.Value;
+ }
+
+ /*
+ * Instance Members
+ * */
+ /*
+ * Fields
+ * */
+ protected T cache;
+ protected Func<T> ValueFunc;
+
+ /*
+ * Properties
+ * */
+ public string Label { get; protected set; }
+ public string Units { get; protected set; }
+
+ public T Value {
+ get {
+ return (T)this.cache;
+ }
+ }
+
+ /*
+ * Methods
+ * */
+ public VOID_DataValue(string Label, Func<T> ValueFunc, string Units = "")
+ {
+ this.Label = Label;
+ this.Units = Units;
+ this.ValueFunc = ValueFunc;
+ this.cache = this.ValueFunc.Invoke ();
+ }
+
+ public void Refresh()
+ {
+ this.cache = this.ValueFunc.Invoke ();
+ }
+
+ public T GetFreshValue()
+ {
+ this.Refresh ();
+ return (T)this.cache;
+ }
+
+ public string ValueUnitString() {
+ return this.Value.ToString() + this.Units;
+ }
+
+ public virtual void DoGUIHorizontal()
+ {
+ GUILayout.BeginHorizontal (GUILayout.ExpandWidth (true));
+ GUILayout.Label (this.Label + ":");
+ GUILayout.FlexibleSpace ();
+ GUILayout.Label (this.ValueUnitString(), GUILayout.ExpandWidth (false));
+ GUILayout.EndHorizontal ();
+ }
+
+ public override string ToString()
+ {
+ return string.Format (
+ "{0}: {1}{2}",
+ this.Label,
+ this.Value.ToString (),
+ this.Units
+ );
+ }
+ }
+
+ internal interface IVOID_NumericValue
+ {
+ string ToString(string format);
+ string ToSIString(int digits, int MinMagnitude, int MaxMagnitude);
+ }
+
+ public abstract class VOID_NumValue<T> : VOID_DataValue<T>, IVOID_NumericValue
+ {
+ public VOID_NumValue(string Label, Func<T> ValueFunc, string Units = "") : base(Label, ValueFunc, Units) {}
+
+ 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 void DoGUIHorizontal(string format)
+ {
+ GUILayout.BeginHorizontal (GUILayout.ExpandWidth (true));
+ GUILayout.Label (this.Label + ":");
+ GUILayout.FlexibleSpace ();
+ GUILayout.Label (this.ValueUnitString(format), GUILayout.ExpandWidth (false));
+ GUILayout.EndHorizontal ();
+ }
+
+ public virtual ushort DoGUIHorizontal(ushort digits)
+ {
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(this.Label + ":", GUILayout.ExpandWidth(true));
+ GUILayout.FlexibleSpace();
+ GUILayout.Label(this.ValueUnitString(digits), GUILayout.ExpandWidth(false));
+ if (GUILayout.Button ("P")) {
+ digits = (ushort)((digits + 3) % 15);
+ }
+ 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 string ToString(string format)
+ {
+ return string.Format (
+ "{0}: {1}{2}",
+ this.Label,
+ this.Value.ToString (format),
+ this.Units
+ );
+ }
+
+ public override string ValueUnitString(string format) {
+ 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 (
+ "{0}{1}",
+ Tools.MuMech_ToSI (this.Value, digits, MinMagnitude, MaxMagnitude),
+ this.Units
+ );
+ }
+ }
+ 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 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 (
+ "{0}: {1}{2}",
+ this.Label,
+ this.Value.ToString (format),
+ this.Units
+ );
+ }
+
+ public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
+ {
+ return string.Format (
+ "{0}{1}",
+ Tools.MuMech_ToSI ((double)this.Value, digits, MinMagnitude, MaxMagnitude),
+ this.Units
+ );
+ }
+ }
+ 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 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 (
+ "{0}: {1}{2}",
+ this.Label,
+ this.Value.ToString (format),
+ this.Units
+ );
+ }
+
+ public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
+ {
+ return string.Format (
+ "{0}{1}",
+ Tools.MuMech_ToSI ((double)this.Value, digits, MinMagnitude, MaxMagnitude),
+ this.Units
+ );
+ }
+ }
+
+
+ public class VOID_StrValue : VOID_DataValue<string>
+ {
+ public VOID_StrValue(string Label, Func<string> ValueFunc) : base(Label, ValueFunc, "") {}
+ }
+}
+
+
--- a/VOID_HUD.cs
+++ b/VOID_HUD.cs
@@ -101,7 +101,8 @@
" ETA " + Tools.ConvertInterval (vessel.orbit.timeToAp) +
"\nPe: " + Tools.MuMech_ToSI (vessel.orbit.PeA) + "m" +
" ETA " + Tools.ConvertInterval (vessel.orbit.timeToPe) +
- "\nInc: " + vessel.orbit.inclination.ToString ("F3") + "°",
+ "\nInc: " + vessel.orbit.inclination.ToString ("F3") + "°" +
+ "\nPrimary: " + vessel.mainBody.bodyName,
labelStyle);
// Toadicus edit: Added "Biome: " line to surf/atmo HUD
GUI.Label (
--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -37,6 +37,8 @@
protected string _Name;
+ protected float lastUpdate = 0;
+
/*
* Properties
* */
@@ -131,22 +133,15 @@
object fieldValue = field.GetValue(this);
bool convertBack = false;
- bool isIntCollection = false;
if (fieldValue is IVOID_SaveValue)
{
- if (fieldValue is IntCollection) {
- isIntCollection = true;
- }
fieldValue = (fieldValue as IVOID_SaveValue).AsType;
convertBack = true;
}
fieldValue = config.GetValue(fieldName, fieldValue);
- if (isIntCollection) {
- fieldValue = new IntCollection (4, (long)fieldValue);
- }
- else if (convertBack)
+ if (convertBack)
{
Type type = typeof(VOID_SaveValue<>).MakeGenericType (fieldValue.GetType ());
IVOID_SaveValue convertValue = Activator.CreateInstance (type) as IVOID_SaveValue;
@@ -200,7 +195,64 @@
protected float defWidth = 250f;
protected float defHeight = 50f;
- public abstract void ModuleWindow(int _);
+ public virtual void ModuleWindow(int _)
+ {
+ if (VOID_Core.Instance.updateTimer - this.lastUpdate > VOID_Core.Instance.updatePeriod) {
+ Tools.PostDebugMessage(string.Format(
+ "{0}: refreshing VOID_DataValues.",
+ this.GetType().Name
+ ));
+
+ foreach (var fieldinfo in this.GetType().GetFields(
+ BindingFlags.Instance |
+ BindingFlags.NonPublic |
+ BindingFlags.Public |
+ BindingFlags.FlattenHierarchy
+ )) {
+ Tools.PostDebugMessage(string.Format(
+ "{0}: checking field {1}.",
+ this.GetType().Name,
+ fieldinfo.Name
+ ));
+
+ object field = null;
+
+ try
+ {
+ field = fieldinfo.GetValue (this);
+ }
+ catch (NullReferenceException) {
+ Tools.PostDebugMessage(string.Format(
+ "{0}: caught NullReferenceException, could not get value for field {1}.",
+ this.GetType().Name,
+ fieldinfo.Name
+ ));
+ }
+
+ if (field == null) {
+ continue;
+ }
+
+ if (typeof(IVOID_DataValue).IsAssignableFrom (field.GetType ())) {
+ Tools.PostDebugMessage(string.Format(
+ "{0}: found field {1}.",
+ this.GetType().Name,
+ fieldinfo.Name
+ ));
+
+ (field as IVOID_DataValue).Refresh ();
+
+ Tools.PostDebugMessage(string.Format(
+ "{0}: refreshed field {1}.",
+ this.GetType().Name,
+ fieldinfo.Name
+ ));
+ }
+ }
+
+ this.lastUpdate = VOID_Core.Instance.updateTimer;
+ }
+ }
public override void DrawGUI()
{
--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -30,7 +30,119 @@
protected VOID_SaveValue<bool> toggleExtended = false;
[AVOID_SaveValue("precisionValues")]
- protected IntCollection precisionValues = new IntCollection(4, 230584300921369395);
+ protected long _precisionValues = 230584300921369395;
+ protected IntCollection precisionValues;
+
+ protected VOID_StrValue primaryName = new VOID_StrValue (
+ VOIDLabels.void_primary,
+ new Func<string> (() => VOID_Core.Instance.vessel.mainBody.name)
+ );
+
+ protected VOID_DoubleValue orbitAltitude = new VOID_DoubleValue (
+ "Altitude (ASL)",
+ new Func<double> (() => VOID_Core.Instance.vessel.orbit.altitude),
+ "m"
+ );
+
+ protected VOID_DoubleValue orbitVelocity = new VOID_DoubleValue (
+ VOIDLabels.void_velocity,
+ new Func<double> (() => VOID_Core.Instance.vessel.orbit.vel.magnitude),
+ "m/s"
+ );
+
+ protected VOID_DoubleValue orbitApoAlt = new VOID_DoubleValue(
+ VOIDLabels.void_apoapsis,
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.ApA),
+ "m"
+ );
+
+ protected VOID_DoubleValue oribtPeriAlt = new VOID_DoubleValue(
+ VOIDLabels.void_periapsis,
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.PeA),
+ "m"
+ );
+
+ protected VOID_StrValue timeToApo = new VOID_StrValue(
+ "Time to Apoapsis",
+ new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
+ );
+
+ protected VOID_StrValue timeToPeri = new VOID_StrValue(
+ "Time to Apoapsis",
+ new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
+ );
+
+ protected VOID_DoubleValue orbitInclination = new VOID_DoubleValue(
+ "Inclination",
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.inclination),
+ "°"
+ );
+
+ protected VOID_DoubleValue gravityAccel = new VOID_DoubleValue(
+ "Gravity",
+ delegate()
+ {
+ double orbitRadius = VOID_Core.Instance.vessel.mainBody.Radius +
+ VOID_Core.Instance.vessel.mainBody.GetAltitude(VOID_Core.Instance.vessel.findWorldCenterOfMass());
+ return (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
+ Math.Pow(orbitRadius, 2);
+ },
+ "m/s²"
+ );
+
+ protected VOID_StrValue orbitPeriod = new VOID_StrValue(
+ "Period",
+ new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
+ );
+
+ protected VOID_DoubleValue semiMajorAxis = new VOID_DoubleValue(
+ "Semi-Major Axis",
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.semiMajorAxis),
+ "m"
+ );
+
+ protected VOID_DoubleValue eccentricity = new VOID_DoubleValue(
+ "Eccentricity",
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricity),
+ ""
+ );
+
+ protected VOID_DoubleValue meanAnomaly = new VOID_DoubleValue(
+ "Mean Anomaly",
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.meanAnomaly * 180d / Math.PI),
+ "°"
+ );
+
+ protected VOID_DoubleValue trueAnomaly = new VOID_DoubleValue(
+ "True Anomaly",
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.trueAnomaly),
+ "°"
+ );
+
+ protected VOID_DoubleValue eccAnomaly = new VOID_DoubleValue(
+ "Eccentric Anomaly",
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricAnomaly * 180d / Math.PI),
+ "°"
+ );
+
+ protected VOID_DoubleValue longitudeAscNode = new VOID_DoubleValue(
+ "Long. Ascending Node",
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.LAN),
+ "°"
+ );
+
+ protected VOID_DoubleValue argumentPeriapsis = new VOID_DoubleValue(
+ "Argument of Periapsis",
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.argumentOfPeriapsis),
+ "°"
+ );
+
+ protected VOID_DoubleValue localSiderealLongitude = new VOID_DoubleValue(
+ "Local Sidereal Longitude",
+ new Func<double>(() => Tools.FixDegreeDomain(
+ VOID_Core.Instance.vessel.longitude + VOID_Core.Instance.vessel.orbit.referenceBody.rotationAngle)),
+ "°"
+ );
public VOID_Orbital()
{
@@ -42,146 +154,76 @@
public override void ModuleWindow(int _)
{
- // Toadicus edit: added local sidereal longitude.
- double LSL = vessel.longitude + vessel.orbit.referenceBody.rotationAngle;
- LSL = Tools.FixDegreeDomain (LSL);
+ base.ModuleWindow (_);
+
int idx = 0;
GUILayout.BeginVertical();
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(VOIDLabels.void_primary + ":");
- GUILayout.Label(vessel.mainBody.bodyName, GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(VOIDLabels.void_altitude_asl + ":");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.orbit.altitude, this.precisionValues [idx]) + "m", GUILayout.ExpandWidth(false));
- GUILayout.FlexibleSpace ();
- if (GUILayout.Button ("P")) {
- this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
- }
- GUILayout.EndHorizontal();
- idx++;
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(VOIDLabels.void_velocity + ":");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.orbit.vel.magnitude, this.precisionValues [idx]) + "m/s", GUILayout.ExpandWidth(false));
- GUILayout.FlexibleSpace ();
- if (GUILayout.Button ("P")) {
- this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
- }
- GUILayout.EndHorizontal();
- idx++;
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(VOIDLabels.void_apoapsis + ":");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.orbit.ApA, this.precisionValues [idx]) + "m", GUILayout.ExpandWidth(false));
- GUILayout.FlexibleSpace ();
- if (GUILayout.Button ("P")) {
- this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
- }
- GUILayout.EndHorizontal();
- idx++;
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Time to Ap:");
- GUILayout.Label(Tools.ConvertInterval(vessel.orbit.timeToAp), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(VOIDLabels.void_periapsis + ":");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.orbit.PeA, this.precisionValues [idx]) + "m", GUILayout.ExpandWidth(false));
- GUILayout.FlexibleSpace ();
- if (GUILayout.Button ("P")) {
- this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
- }
- GUILayout.EndHorizontal();
- idx++;
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Time to Pe:");
- GUILayout.Label(Tools.ConvertInterval(vessel.orbit.timeToPe), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Inclination:");
- GUILayout.Label(vessel.orbit.inclination.ToString("F3") + "°", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- double r_vessel = vessel.mainBody.Radius + vessel.mainBody.GetAltitude(vessel.findWorldCenterOfMass());
- double g_vessel = (VOID_Core.Constant_G * vessel.mainBody.Mass) / Math.Pow(r_vessel, 2);
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Gravity:");
- GUILayout.Label(Tools.MuMech_ToSI(g_vessel, this.precisionValues[idx]) + "m/s²", GUILayout.ExpandWidth(false));
- GUILayout.FlexibleSpace ();
- if (GUILayout.Button ("P")) {
- this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
- }
- GUILayout.EndHorizontal();
+ 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]);
+ idx++;
+
+ this.timeToApo.DoGUIHorizontal();
+
+ this.precisionValues [idx] = 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");
if (this.toggleExtended)
{
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Period:");
- GUILayout.Label(Tools.ConvertInterval(vessel.orbit.period), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Semi-major axis:");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.orbit.semiMajorAxis, this.precisionValues [idx]) + "m", GUILayout.ExpandWidth(false));
- GUILayout.FlexibleSpace ();
- if (GUILayout.Button ("P")) {
- this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
- }
- GUILayout.EndHorizontal();
+ this.orbitPeriod.DoGUIHorizontal();
+
+ this.precisionValues [idx] = this.semiMajorAxis.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Eccentricity:");
- GUILayout.Label(vessel.orbit.eccentricity.ToString("F4"), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- // Toadicus edit: convert mean anomaly into degrees.
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Mean anomaly:");
- GUILayout.Label((vessel.orbit.meanAnomaly * 180d / Math.PI).ToString("F3") + "°", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("True anomaly:");
- GUILayout.Label(vessel.orbit.trueAnomaly.ToString("F3") + "°", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- // Toadicus edit: convert eccentric anomaly into degrees.
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Eccentric anomaly:");
- GUILayout.Label((vessel.orbit.eccentricAnomaly * 180d / Math.PI).ToString("F3") + "°", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Long. ascending node:");
- GUILayout.Label(vessel.orbit.LAN.ToString("F3") + "°", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Arg. of periapsis:");
- GUILayout.Label(vessel.orbit.argumentOfPeriapsis.ToString("F3") + "°", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- // Toadicus edit: added local sidereal longitude.
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Local Sidereal Longitude:");
- GUILayout.Label(LSL.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"]);
- GUILayout.EndHorizontal();
+ this.eccentricity.DoGUIHorizontal("F4");
+
+ this.meanAnomaly.DoGUIHorizontal("F3");
+
+ this.trueAnomaly.DoGUIHorizontal("F3");
+
+ this.eccAnomaly.DoGUIHorizontal("F3");
+
+ this.longitudeAscNode.DoGUIHorizontal("F3");
+
+ this.argumentPeriapsis.DoGUIHorizontal("F3");
+
+ this.localSiderealLongitude.DoGUIHorizontal("F3");
}
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_Rendezvous.cs
+++ b/VOID_Rendezvous.cs
@@ -230,7 +230,7 @@
// Toadicus edit: added local sidereal longitude.
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Local Sidereal Longitude:");
- GUILayout.Label(LSL.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"]);
+ GUILayout.Label(LSL.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"]);
GUILayout.EndHorizontal();
}
}
--- a/VOID_SurfAtmo.cs
+++ b/VOID_SurfAtmo.cs
@@ -104,7 +104,7 @@
// Toadicus edit: added Biome
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Biome:");
- GUILayout.Label(Tools.Toadicus_GetAtt(vessel).name, VOID_Core.Instance.LabelStyles["txt_right"]);
+ GUILayout.Label(Tools.Toadicus_GetAtt(vessel).name, VOID_Core.Instance.LabelStyles["right"]);
GUILayout.EndHorizontal();
GUILayout.EndVertical();
--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -48,7 +48,10 @@
GUILayout.BeginVertical();
- GUILayout.Label(vessel.vesselName, VOID_Core.Instance.LabelStyles["center_bold"], GUILayout.ExpandWidth(true));
+ GUILayout.Label(
+ vessel.vesselName,
+ VOID_Core.Instance.LabelStyles["center_bold"],
+ GUILayout.ExpandWidth(true));
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("G-force:");
@@ -68,7 +71,10 @@
foreach (PartModule pm in p.Modules)
{
- if ((pm.moduleName == "ModuleEngines") && ((p.State == PartStates.ACTIVE) || ((Staging.CurrentStage > Staging.lastStage) && (p.inverseStage == Staging.lastStage))))
+ if ((pm.moduleName == "ModuleEngines") &&
+ ((p.State == PartStates.ACTIVE) ||
+ ((Staging.CurrentStage > Staging.lastStage) && (p.inverseStage == Staging.lastStage)))
+ )
{
max_thrust += ((ModuleEngines)pm).maxThrust;
final_thrust += ((ModuleEngines)pm).finalThrust;
@@ -95,7 +101,9 @@
{
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("DeltaV (Current Stage):");
- GUILayout.Label(Tools.MuMech_ToSI(stages[Staging.lastStage].deltaV).ToString() + "m/s", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ Tools.MuMech_ToSI(stages[Staging.lastStage].deltaV).ToString() + "m/s",
+ GUILayout.ExpandWidth(false));
GUILayout.EndHorizontal();
}
@@ -121,13 +129,19 @@
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Thrust (curr/max):");
- GUILayout.Label(final_thrust.ToString("F1") + " / " + max_thrust.ToString("F1") + " kN", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ final_thrust.ToString("F1") +
+ " / " + max_thrust.ToString("F1") + " kN",
+ GUILayout.ExpandWidth(false));
GUILayout.EndHorizontal();
double gravity = vessel.mainBody.gravParameter / Math.Pow(vessel.mainBody.Radius + vessel.altitude, 2);
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("T:W (curr/max):");
- GUILayout.Label((final_thrust / (total_mass * gravity)).ToString("F2") + " / " + (max_thrust / (total_mass * gravity)).ToString("F2"), GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ (final_thrust / (total_mass * gravity)).ToString("F2") +
+ " / " + (max_thrust / (total_mass * gravity)).ToString("F2"),
+ GUILayout.ExpandWidth(false));
GUILayout.EndHorizontal();
double g_ASL = (VOID_Core.Constant_G * vessel.mainBody.Mass) / Math.Pow(vessel.mainBody.Radius, 2);