VOID_Tools: GetWindowHandler now handles all exceptions and logs all but ArgumentException verbosely.
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -39,7 +39,7 @@
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("0.12.0.*")]
+[assembly: AssemblyVersion("0.14.2.*")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
//[assembly: AssemblyDelaySign(false)]
--- a/VOID.csproj
+++ b/VOID.csproj
@@ -96,6 +96,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="VOID_HUDAdvanced.cs" />
<Compile Include="VOID_TWR.cs" />
+ <Compile Include="VOID_CareerStatus.cs" />
</ItemGroup>
<ProjectExtensions>
<MonoDevelop>
--- a/VOID_CBInfoBrowser.cs
+++ b/VOID_CBInfoBrowser.cs
@@ -50,6 +50,9 @@
[AVOID_SaveValue("togglePhysical")]
protected VOID_SaveValue<bool> togglePhysical = false;
+
+ [AVOID_SaveValue("toggleScience")]
+ protected VOID_SaveValue<bool> toggleScience = false;
public VOID_CBInfoBrowser()
{
@@ -208,6 +211,72 @@
GUILayout.EndHorizontal();
}
+ if (GUILayout.Button("Scientific Parameters", GUILayout.ExpandWidth(true)))
+ {
+ toggleScience.value = !toggleScience;
+ }
+
+ if (toggleScience)
+ {
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+ //begin physical info value label column
+ GUILayout.BeginVertical(GUILayout.Width(150));
+
+
+ /*
+ * public float RecoveryValue = 1f;
+
+ public float InSpaceHighDataValue = 1f;
+
+ public float spaceAltitudeThreshold = 250000f;
+
+ public float flyingAltitudeThreshold = 18000f;
+
+ public float InSpaceLowDataValue = 1f;
+
+ public float SplashedDataValue = 1f;
+
+ public float LandedDataValue = 1f;
+
+ public float FlyingHighDataValue = 1f;
+
+ public float FlyingLowDataValue = 1f;
+ */
+
+ GUILayout.Label("Surface Multiplier:");
+ GUILayout.Label("Ocean Multiplier:");
+ GUILayout.Label("Flying-Low Multiplier:");
+ GUILayout.Label("Flying-High Multiplier:");
+ GUILayout.Label("Low Orbit Multiplier:");
+ GUILayout.Label("High Orbit Multiplier:");
+ GUILayout.Label("'Flying-High' Altitude:");
+ GUILayout.Label("'High Orbit' Altitude:");
+ GUILayout.Label("Recovery Multiplier:");
+
+ //end physical info value label column
+ GUILayout.EndVertical();
+
+ //begin primary physical values column
+ GUILayout.BeginVertical(GUILayout.Width(150));
+
+ this.cbColumnScience(selectedBody1);
+
+ //end primary physical column
+ GUILayout.EndVertical();
+
+ //begin secondary physical values column
+ GUILayout.BeginVertical(GUILayout.Width(150));
+
+ this.cbColumnScience(selectedBody2);
+
+ //end target physical values column
+ GUILayout.EndVertical();
+
+ //end physical value horizontal chunk
+ GUILayout.EndHorizontal();
+ }
+
GUI.DragWindow();
}
@@ -323,5 +392,61 @@
if (body.ocean == true) ocean = "Yes";
GUILayout.Label(ocean, this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
}
+
+ private void cbColumnScience(CelestialBody body)
+ {
+ /*GUILayout.Label("Surface Science Multiplier:");
+ GUILayout.Label("Ocean Science Multiplier:");
+ GUILayout.Label("Low-Atmosphere Science Multiplier:");
+ GUILayout.Label("High-Atmosphere Science Multiplier:");
+ GUILayout.Label("Low Orbit Science Multiplier:");
+ GUILayout.Label("High Orbit Science Multiplier:");
+ GUILayout.Label("'In Space' Altitude:");
+ GUILayout.Label("'Flying' Altitude:");
+ GUILayout.Label("Recovery Multiplier:");*/
+
+ var scienceValues = body.scienceValues;
+
+ GUILayout.Label(scienceValues.LandedDataValue.ToString("0.0#"),
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(
+ body.ocean ? scienceValues.SplashedDataValue.ToString("0.0#") : "N/A",
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(
+ body.atmosphere ? scienceValues.FlyingLowDataValue.ToString("0.0#") : "N/A",
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(
+ body.atmosphere ? scienceValues.FlyingHighDataValue.ToString("0.0#") : "N/A",
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(scienceValues.InSpaceLowDataValue.ToString("0.0#"),
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(scienceValues.InSpaceHighDataValue.ToString("0.0#"),
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(
+ body.atmosphere ? scienceValues.flyingAltitudeThreshold.ToString("N0") : "N/A",
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(
+ scienceValues.spaceAltitudeThreshold.ToString("N0"),
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ GUILayout.Label(scienceValues.RecoveryValue.ToString("0.0#"),
+ this.core.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+ }
}
}
--- /dev/null
+++ b/VOID_CareerStatus.cs
@@ -1,1 +1,292 @@
-
+// VOID
+//
+// VOID_CareerStatus.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation and/or other
+// materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+// to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using KSP;
+using System;
+using System.Text;
+using ToadicusTools;
+using UnityEngine;
+
+namespace VOID
+{
+ public class VOID_CareerStatus : VOID_WindowModule
+ {
+ public static VOID_CareerStatus Instance
+ {
+ get;
+ private set;
+ }
+
+ public static string formatDelta(double delta)
+ {
+ if (delta > 0)
+ {
+ return string.Format("<color='green'>{0:#,#.##}↑</color>", delta);
+ }
+ else if (delta < 0)
+ {
+ return string.Format("<color='red'>{0:#,#.##}↓</color>", delta);
+ }
+ else
+ {
+ return string.Intern("0");
+ }
+ }
+
+ public static string formatDelta(float delta)
+ {
+ return formatDelta((double)delta);
+ }
+
+ private GUIContent fundsContent;
+ private GUIContent repContent;
+ private GUIContent scienceContent;
+
+ private Texture2D fundsIconGreen;
+ private Texture2D fundsIconRed;
+ private Texture2D reputationIconGreen;
+ private Texture2D reputationIconRed;
+ private Texture2D scienceIcon;
+
+ public override bool toggleActive
+ {
+ get
+ {
+ switch (HighLogic.CurrentGame.Mode)
+ {
+ case Game.Modes.CAREER:
+ case Game.Modes.SCIENCE_SANDBOX:
+ return base.toggleActive;
+ default:
+ return false;
+ }
+ }
+ set
+ {
+ switch (HighLogic.CurrentGame.Mode)
+ {
+ case Game.Modes.CAREER:
+ case Game.Modes.SCIENCE_SANDBOX:
+ base.toggleActive = value;
+ break;
+ default:
+ return;
+ }
+ }
+ }
+
+ public double lastFundsChange
+ {
+ get;
+ private set;
+ }
+
+ public float lastRepChange
+ {
+ get;
+ private set;
+ }
+
+ public float lastScienceChange
+ {
+ get;
+ private set;
+ }
+
+ public double currentFunds
+ {
+ get;
+ private set;
+ }
+
+ public float currentReputation
+ {
+ get;
+ private set;
+ }
+
+ public float currentScience
+ {
+ get;
+ private set;
+ }
+
+ public override void ModuleWindow(int _)
+ {
+ GUILayout.BeginVertical();
+
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(VOID_Data.fundingStatus.Label);
+ GUILayout.FlexibleSpace();
+ this.fundsContent.text = VOID_Data.fundingStatus.Value;
+ GUILayout.Label(this.fundsContent, GUILayout.ExpandWidth(false));
+ GUILayout.EndHorizontal();
+
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(VOID_Data.reputationStatus.Label);
+ GUILayout.FlexibleSpace();
+ this.repContent.text = VOID_Data.reputationStatus.Value;
+ GUILayout.Label(this.repContent, GUILayout.ExpandWidth(false));
+ GUILayout.EndHorizontal();
+
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(VOID_Data.scienceStatus.Label);
+ GUILayout.FlexibleSpace();
+ this.scienceContent.text = VOID_Data.scienceStatus.Value;
+ GUILayout.Label(this.scienceContent, GUILayout.ExpandWidth(false));
+ GUILayout.EndHorizontal();
+
+ GUILayout.EndVertical();
+
+ GUI.DragWindow();
+ }
+
+ // TODO: Update event handlers to do something useful with the new "reasons" parameter.
+ private void onFundsChange(double newValue, TransactionReasons reasons)
+ {
+ this.lastFundsChange = newValue - this.currentFunds;
+ this.currentFunds = newValue;
+ }
+
+ private void onRepChange(float newValue, TransactionReasons reasons)
+ {
+ this.lastRepChange = newValue - this.currentReputation;
+ this.currentReputation = newValue;
+ }
+
+ private void onScienceChange(float newValue, TransactionReasons reasons)
+ {
+ this.lastScienceChange = newValue - this.currentScience;
+ this.currentScience = newValue;
+ }
+
+ /*
+ * MissionRecoveryDialog::fundsIconGreen.name: UiElements_05
+ * MissionRecoveryDialog::fundsIconRed.name: UiElements_06
+ * MissionRecoveryDialog::reputationIconGreen.name: UiElements_07
+ * MissionRecoveryDialog::reputationIconRed.name: UiElements_08
+ * MissionRecoveryDialog::scienceIcon.name: UiElements_12
+ * */
+ public VOID_CareerStatus() : base()
+ {
+ VOID_CareerStatus.Instance = this;
+
+ this._Name = "Career Status";
+
+ GameEvents.OnFundsChanged.Add(this.onFundsChange);
+ GameEvents.OnReputationChanged.Add(this.onRepChange);
+ GameEvents.OnScienceChanged.Add(this.onScienceChange);
+
+ bool texturesLoaded;
+
+ texturesLoaded = IOTools.LoadTexture(out this.fundsIconGreen, "VOID/Textures/fundsgreen.png", 10, 18);
+ texturesLoaded &= IOTools.LoadTexture(out this.fundsIconRed, "VOID/Textures/fundsred.png", 10, 18);
+ texturesLoaded &= IOTools.LoadTexture(out this.reputationIconGreen, "VOID/Textures/repgreen.png", 16, 18);
+ texturesLoaded &= IOTools.LoadTexture(out this.reputationIconRed, "VOID/Textures/repred.png", 16, 18);
+ texturesLoaded &= IOTools.LoadTexture(out this.scienceIcon, "VOID/Textures/science.png", 16, 18);
+
+ this.fundsContent = new GUIContent();
+ this.repContent = new GUIContent();
+ this.scienceContent = new GUIContent();
+
+ if (texturesLoaded)
+ {
+ this.fundsContent.image = this.fundsIconGreen;
+ this.repContent.image = this.reputationIconGreen;
+ this.scienceContent.image = this.scienceIcon;
+ }
+
+ this.currentFunds = Funding.Instance != null ? Funding.Instance.Funds : double.NaN;
+ this.currentReputation = Reputation.Instance != null ? Reputation.Instance.reputation : float.NaN;
+ this.currentScience = ResearchAndDevelopment.Instance != null ?
+ ResearchAndDevelopment.Instance.Science : float.NaN;
+ }
+
+ ~VOID_CareerStatus()
+ {
+ GameEvents.OnFundsChanged.Remove(this.onFundsChange);
+ GameEvents.OnReputationChanged.Remove(this.onRepChange);
+ GameEvents.OnScienceChanged.Remove(this.onScienceChange);
+
+ VOID_CareerStatus.Instance = null;
+ }
+ }
+
+ public static partial class VOID_Data
+ {
+ public static readonly VOID_StrValue fundingStatus = new VOID_StrValue(
+ string.Intern("Funds"),
+ delegate()
+ {
+ if (VOID_CareerStatus.Instance == null)
+ {
+ return string.Empty;
+ }
+
+ return string.Format("{0} ({1})",
+ VOID_CareerStatus.Instance.currentFunds.ToString("#,#.##"),
+ VOID_CareerStatus.formatDelta(VOID_CareerStatus.Instance.lastFundsChange)
+ );
+ }
+ );
+
+ public static readonly VOID_StrValue reputationStatus = new VOID_StrValue(
+ string.Intern("Reputation"),
+ delegate()
+ {
+ if (VOID_CareerStatus.Instance == null)
+ {
+ return string.Empty;
+ }
+
+ return string.Format("{0} ({1})",
+ VOID_CareerStatus.Instance.currentReputation.ToString("#,#.##"),
+ VOID_CareerStatus.formatDelta(VOID_CareerStatus.Instance.lastRepChange)
+ );
+ }
+ );
+
+ public static readonly VOID_StrValue scienceStatus = new VOID_StrValue(
+ string.Intern("Science"),
+ delegate()
+ {
+ if (VOID_CareerStatus.Instance == null)
+ {
+ return string.Empty;
+ }
+
+ return string.Format("{0} ({1})",
+ VOID_CareerStatus.Instance.currentScience.ToString("#,#.##"),
+ VOID_CareerStatus.formatDelta(VOID_CareerStatus.Instance.lastScienceChange)
+ );
+ }
+ );
+ }
+}
+
+
--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -31,6 +31,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Text;
using ToadicusTools;
using UnityEngine;
@@ -70,6 +71,7 @@
public static void Reset()
{
_instance.StopGUI();
+ _instance.Dispose();
_instance = null;
_initialized = false;
}
@@ -175,6 +177,8 @@
protected VOID_SaveValue<bool> _UseToolbarManager;
internal IButton ToolbarButton;
+ internal ApplicationLauncherButton AppLauncherButton;
+
/*
* Properties
* */
@@ -281,6 +285,18 @@
}
}
+ public Stage[] Stages
+ {
+ get;
+ protected set;
+ }
+
+ public Stage LastStage
+ {
+ get;
+ protected set;
+ }
+
protected IconState powerState
{
get
@@ -333,10 +349,24 @@
}
if (value == true)
{
+ if (this.AppLauncherButton != null)
+ {
+ ApplicationLauncher.Instance.RemoveModApplication(this.AppLauncherButton);
+ this.AppLauncherButton = null;
+ }
+
this.InitializeToolbarButton();
}
_UseToolbarManager.value = value;
+ }
+ }
+
+ protected virtual ApplicationLauncher.AppScenes appIconVisibleScenes
+ {
+ get
+ {
+ return ApplicationLauncher.AppScenes.FLIGHT;
}
}
@@ -362,17 +392,33 @@
if (!this.GUIStylesLoaded)
{
this.LoadGUIStyles();
+
+ Tools.PostDebugMessage(
+ this,
+ "ToolbarAvailable: {0}, UseToobarManager: {1}",
+ ToolbarManager.ToolbarAvailable,
+ this.UseToolbarManager);
}
if (!this.UseToolbarManager)
{
- if (GUI.Button(VOIDIconPos, VOIDIconTexture, this.iconStyle) && this.VOIDIconLocked)
- {
- this.ToggleMainWindow();
+ if (this.AppLauncherButton == null)
+ {
+ Tools.PostDebugMessage(this,
+ "UseToolbarManager = false (ToolbarAvailable = {0}) and " +
+ "AppLauncherButton is null, making AppLauncher button.",
+ ToolbarManager.ToolbarAvailable
+ );
+ this.InitializeAppLauncherButton();
}
}
else if (this.ToolbarButton == null)
{
+ Tools.PostDebugMessage(this,
+ "UseToolbarManager = true (ToolbarAvailable = {0}) and " +
+ "ToolbarButton is null, making Toolbar button.",
+ ToolbarManager.ToolbarAvailable
+ );
this.InitializeToolbarButton();
}
@@ -420,7 +466,7 @@
}
}
- public void OnGUI()
+ public virtual void OnGUI()
{
if (Event.current.type == EventType.Repaint)
{
@@ -474,20 +520,14 @@
}
}
- public void Update()
+ public virtual void Update()
{
this.LoadBeforeUpdate();
if (this.vessel != null && this.vesselSimActive)
{
- double radius = this.vessel.Radius();
- SimManager.Gravity = this.vessel.mainBody.gravParameter /
- (radius * radius);
- SimManager.TryStartSimulation();
- }
- else if (!this.vesselSimActive)
- {
- SimManager.ClearResults();
+ Tools.PostDebugMessage(this, "Updating SimManager.");
+ this.UpdateSimManager();
}
if (!this.guiRunning)
@@ -524,7 +564,7 @@
this._updateTimer += Time.deltaTime;
}
- public void FixedUpdate()
+ public virtual void FixedUpdate()
{
bool newPowerState = this.powerAvailable;
@@ -694,7 +734,7 @@
this.stringFrequency = (1f / this.updatePeriod).ToString();
}
this.stringFrequency = GUILayout.TextField(this.stringFrequency.ToString(), 5, GUILayout.ExpandWidth(true));
- // GUILayout.FlexibleSpace();
+
if (GUILayout.Button("Apply"))
{
double updateFreq = 1f / this.updatePeriod;
@@ -711,45 +751,89 @@
this._factoryReset = GUILayout.Toggle(this._factoryReset, "Factory Reset");
}
+ protected void UpdateSimManager()
+ {
+ if (SimManager.ResultsReady())
+ {
+ Tools.PostDebugMessage(this, "VesselSimulator results ready, setting Stages.");
+
+ this.Stages = SimManager.Stages;
+
+ if (this.Stages != null)
+ {
+ this.LastStage = this.Stages.Last();
+ }
+
+ if (HighLogic.LoadedSceneIsEditor)
+ {
+ SimManager.Gravity = VOID_Data.KerbinGee;
+ }
+ else
+ {
+ double radius = this.vessel.Radius();
+ SimManager.Gravity = this.vessel.mainBody.gravParameter / (radius * radius);
+ }
+
+ SimManager.minSimTime = (long)(this.updatePeriod * 1000);
+
+ SimManager.TryStartSimulation();
+ }
+ #if DEBUG
+ else
+ {
+ Tools.PostDebugMessage(this, "VesselSimulator results not ready.");
+ }
+ #endif
+ }
+
protected void LoadModulesOfType<T>()
{
- var types = AssemblyLoader.loadedAssemblies
- .Select(a => a.assembly.GetExportedTypes())
- .SelectMany(t => t)
- .Where(v => typeof(T).IsAssignableFrom(v)
- && !(v.IsInterface || v.IsAbstract) &&
- !typeof(VOID_Core).IsAssignableFrom(v)
- );
-
- Tools.PostDebugMessage(string.Format(
- "{0}: Found {1} modules to check.",
- this.GetType().Name,
- types.Count()
- ));
- foreach (var voidType in types)
- {
- if (!HighLogic.LoadedSceneIsEditor &&
- typeof(IVOID_EditorModule).IsAssignableFrom(voidType))
- {
- continue;
- }
-
- Tools.PostDebugMessage(string.Format(
- "{0}: found Type {1}",
- this.GetType().Name,
- voidType.Name
- ));
-
- this.LoadModule(voidType);
+ StringBuilder sb = new StringBuilder("Loading modules...");
+ sb.AppendLine();
+
+ foreach (AssemblyLoader.LoadedAssembly assy in AssemblyLoader.loadedAssemblies)
+ {
+ foreach (Type loadedType in assy.assembly.GetExportedTypes())
+ {
+ if (
+ loadedType.IsInterface ||
+ loadedType.IsAbstract ||
+ !typeof(T).IsAssignableFrom(loadedType) ||
+ this.GetType().IsAssignableFrom(loadedType)
+ )
+ {
+ continue;
+ }
+
+ // HACK: This stops editor modules from loading in flight. It is a dirty hack and should be fixed.
+ if (!HighLogic.LoadedSceneIsEditor && typeof(IVOID_EditorModule).IsAssignableFrom(loadedType))
+ {
+ continue;
+ }
+
+ sb.AppendFormat("Loading IVOID_Module type {0}...", loadedType.Name);
+
+ try
+ {
+ this.LoadModule(loadedType);
+ sb.AppendLine("Success.");
+ }
+ catch (Exception ex)
+ {
+ sb.AppendFormat("Failed, caught {0}", ex.GetType().Name);
+ sb.AppendLine();
+
+ #if DEBUG
+ Debug.LogException(ex);
+ #endif
+ }
+ }
}
this._modulesLoaded = true;
- Tools.PostDebugMessage(string.Format(
- "{0}: Loaded {1} modules.",
- this.GetType().Name,
- this.Modules.Count
- ));
+ sb.AppendFormat("Loaded {0} modules.", this.Modules.Count);
+ sb.AppendLine();
}
protected void LoadModule(Type T)
@@ -857,10 +941,7 @@
this.iconStyle = new GUIStyle(GUI.skin.button);
this.iconStyle.padding = new RectOffset(0, 0, 0, 0);
- // this.iconStyle.margin = new RectOffset(0, 0, 0, 0);
- // this.iconStyle.contentOffset = new Vector2(0, 0);
this.iconStyle.overflow = new RectOffset(0, 0, 0, 0);
- // this.iconStyle.border = new RectOffset(0, 0, 0, 0);
this.GUIStylesLoaded = true;
}
@@ -881,9 +962,10 @@
protected void InitializeToolbarButton()
{
- // Do nothing if the Toolbar is not available.
+ // Do nothing if (the Toolbar is not available.
if (!ToolbarManager.ToolbarAvailable)
{
+ Tools.PostDebugMessage(this, "Refusing to make a ToolbarButton: ToolbarAvailable = false");
return;
}
@@ -900,6 +982,27 @@
};
Tools.PostDebugMessage(string.Format("{0}: Toolbar Button initialized.", this.GetType().Name));
+ }
+
+ protected void InitializeAppLauncherButton()
+ {
+ if (ApplicationLauncher.Ready)
+ {
+ this.AppLauncherButton = ApplicationLauncher.Instance.AddModApplication(
+ this.ToggleMainWindow, this.ToggleMainWindow,
+ this.appIconVisibleScenes,
+ this.VOIDIconTexture
+ );
+
+ Tools.PostDebugMessage(
+ this,
+ "AppLauncherButton initialized in {0}",
+ Enum.GetName(
+ typeof(GameScenes),
+ HighLogic.LoadedScene
+ )
+ );
+ }
}
protected void ToggleMainWindow()
@@ -936,7 +1039,12 @@
this.ToolbarButton.TexturePath = texturePath;
}
- this.VOIDIconTexture = GameDatabase.Instance.GetTexture(texturePath, false);
+ this.VOIDIconTexture = GameDatabase.Instance.GetTexture(texturePath.Replace("icon", "appIcon"), false);
+
+ if (this.AppLauncherButton != null)
+ {
+ this.AppLauncherButton.SetTexture(VOIDIconTexture);
+ }
}
protected void CheckAndSave()
@@ -996,7 +1104,7 @@
this.VoidVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.MajorRevision);
- this._Active.value = true;
+ this.toggleActive = true;
this._skinName = this.defaultSkin;
this._skinIdx = int.MinValue;
@@ -1015,6 +1123,20 @@
this.SetIconTexture(this.powerState | this.activeState);
}
+ public virtual void Dispose()
+ {
+ if (this.AppLauncherButton != null)
+ {
+ ApplicationLauncher.Instance.RemoveModApplication(this.AppLauncherButton);
+ this.AppLauncherButton = null;
+ }
+ if (this.ToolbarButton != null)
+ {
+ this.ToolbarButton.Destroy();
+ this.ToolbarButton = null;
+ }
+ }
+
protected enum IconState
{
PowerOff = 1,
@@ -1045,9 +1167,16 @@
{
get
{
- return core.Kerbin.gravParameter / (core.Kerbin.Radius * core.Kerbin.Radius);
- }
- }
+ if (kerbinGee == default(double))
+ {
+ kerbinGee = core.Kerbin.gravParameter / (core.Kerbin.Radius * core.Kerbin.Radius);
+ }
+
+ return kerbinGee;
+ }
+ }
+
+ private static double kerbinGee;
}
}
--- a/VOID_DataLogger.cs
+++ b/VOID_DataLogger.cs
@@ -29,6 +29,7 @@
using KSP;
using System;
using System.Collections.Generic;
+using System.Text;
using ToadicusTools;
using UnityEngine;
@@ -139,7 +140,10 @@
GUILayout.EndHorizontal();
float new_log_interval;
- if (Single.TryParse(csv_log_interval_str, out new_log_interval)) csv_log_interval = new_log_interval;
+ if (float.TryParse(csv_log_interval_str, out new_log_interval))
+ {
+ csv_log_interval = new_log_interval;
+ }
GUILayout.EndVertical();
GUI.DragWindow();
@@ -206,41 +210,92 @@
//called if logging is on and interval has passed
//writes one line to the csvList
- string line = "";
+ StringBuilder line = new StringBuilder();
+
if (first_write && !KSP.IO.File.Exists<VOID_Core>(vessel.vesselName + "_data.csv", null))
{
first_write = false;
- line += "Mission Elapsed Time (s);Altitude ASL (m);Altitude above terrain (m);Orbital Velocity (m/s);Surface Velocity (m/s);Vertical Speed (m/s);Horizontal Speed (m/s);Gee Force (gees);Temperature (°C);Gravity (m/s²);Atmosphere Density (g/m³);\n";
- }
+ line.Append(
+ "Mission Elapsed Time (s);" +
+ "Altitude ASL (m);" +
+ "Altitude above terrain (m);" +
+ "Surface Latitude (°);" +
+ "Surface Longitude (°);" +
+ "Orbital Velocity (m/s);" +
+ "Surface Velocity (m/s);" +
+ "Vertical Speed (m/s);" +
+ "Horizontal Speed (m/s);" +
+ "Gee Force (gees);" +
+ "Temperature (°C);" +
+ "Gravity (m/s²);" +
+ "Atmosphere Density (g/m³);" +
+ "\n"
+ );
+ }
+
//Mission time
- line += vessel.missionTime.ToString("F3") + ";";
+ line.Append(vessel.missionTime.ToString("F3"));
+ line.Append(';');
+
//Altitude ASL
- line += vessel.orbit.altitude.ToString("F3") + ";";
+ line.Append(vessel.orbit.altitude.ToString("F3"));
+ line.Append(';');
+
//Altitude (true)
double alt_true = vessel.orbit.altitude - vessel.terrainAltitude;
if (vessel.terrainAltitude < 0) alt_true = vessel.orbit.altitude;
- line += alt_true.ToString("F3") + ";";
+ line.Append(alt_true.ToString("F3"));
+ line.Append(';');
+
+ // Surface Latitude
+ line.Append(VOID_Data.surfLatitude.Value);
+ line.Append(';');
+
+ // Surface Longitude
+ line.Append(VOID_Data.surfLongitude.Value);
+ line.Append(';');
+
//Orbital velocity
- line += vessel.orbit.vel.magnitude.ToString("F3") + ";";
+ line.Append(vessel.orbit.vel.magnitude.ToString("F3"));
+ line.Append(';');
+
//surface velocity
- line += vessel.srf_velocity.magnitude.ToString("F3") + ";";
+ line.Append(vessel.srf_velocity.magnitude.ToString("F3"));
+ line.Append(';');
+
//vertical speed
- line += vessel.verticalSpeed.ToString("F3") + ";";
+ line.Append(vessel.verticalSpeed.ToString("F3"));
+ line.Append(';');
+
//horizontal speed
- line += vessel.horizontalSrfSpeed.ToString("F3") + ";";
+ line.Append(vessel.horizontalSrfSpeed.ToString("F3"));
+ line.Append(';');
+
//gee force
- line += vessel.geeForce.ToString("F3") + ";";
+ line.Append(vessel.geeForce.ToString("F3"));
+ line.Append(';');
+
//temperature
- line += vessel.flightIntegrator.getExternalTemperature().ToString("F2") + ";";
+ line.Append(vessel.flightIntegrator.getExternalTemperature().ToString("F2"));
+ line.Append(';');
+
//gravity
double r_vessel = vessel.mainBody.Radius + vessel.mainBody.GetAltitude(vessel.findWorldCenterOfMass());
double g_vessel = (VOID_Core.Constant_G * vessel.mainBody.Mass) / (r_vessel * r_vessel);
- line += g_vessel.ToString("F3") + ";";
+ line.Append(g_vessel.ToString("F3"));
+ line.Append(';');
+
//atm density
- line += (vessel.atmDensity * 1000).ToString("F3") + ";";
- line += "\n";
- if (csvList.Contains(line) == false) csvList.Add(line);
+ line.Append((vessel.atmDensity * 1000).ToString("F3"));
+ line.Append(';');
+
+ line.Append('\n');
+
+ csvList.Add(line.ToString());
+
csvCollectTimer = 0f;
}
}
}
+
+
--- a/VOID_EditorCore.cs
+++ b/VOID_EditorCore.cs
@@ -69,8 +69,17 @@
if (_initialized)
{
_instance.StopGUI();
+ _instance.Dispose();
_instance = null;
_initialized = false;
+ }
+ }
+
+ protected override ApplicationLauncher.AppScenes appIconVisibleScenes
+ {
+ get
+ {
+ return ApplicationLauncher.AppScenes.VAB | ApplicationLauncher.AppScenes.SPH;
}
}
@@ -79,7 +88,7 @@
this._Name = "VOID Editor Core";
}
- public new void OnGUI() {}
+ public override void OnGUI() {}
public override void DrawGUI()
{
@@ -100,7 +109,7 @@
base.DrawGUI();
}
- public new void Update()
+ public override void Update()
{
foreach (IVOID_EditorModule module in this.Modules)
{
@@ -131,18 +140,14 @@
if (EditorLogic.SortedShipList.Count > 0 && this.vesselSimActive)
{
- SimManager.Gravity = VOID_Data.KerbinGee;
- SimManager.TryStartSimulation();
- }
- else if (!this.vesselSimActive)
- {
- SimManager.ClearResults();
+ Tools.PostDebugMessage(this, "Updating SimManager.");
+ this.UpdateSimManager();
}
this.CheckAndSave ();
}
- public new void FixedUpdate() {}
+ public override void FixedUpdate() {}
}
}
--- a/VOID_EditorHUD.cs
+++ b/VOID_EditorHUD.cs
@@ -120,7 +120,7 @@
{
this._Name = "Heads-Up Display";
- this._Active.value = true;
+ this.toggleActive = true;
this.textColors.Add(Color.green);
this.textColors.Add(Color.black);
@@ -143,7 +143,7 @@
{
SimManager.RequestSimulation();
- if (SimManager.LastStage == null)
+ if (this.core.LastStage == null)
{
return;
}
@@ -164,6 +164,8 @@
return;
}
+ GUI.skin = this.core.Skin;
+
Rect hudPos = new Rect (hudLeft, 48, 300, 32);
hudString = new StringBuilder();
@@ -173,7 +175,7 @@
labelStyle.normal.textColor = textColors [ColorIndex];
hudString.Append("Total Mass: ");
- hudString.Append(SimManager.LastStage.totalMass.ToString("F3"));
+ hudString.Append(this.core.LastStage.totalMass.ToString("F3"));
hudString.Append('t');
hudString.Append(' ');
@@ -184,19 +186,19 @@
hudString.Append('\n');
hudString.Append("Total Delta-V: ");
- hudString.Append(Tools.MuMech_ToSI(SimManager.LastStage.totalDeltaV));
+ hudString.Append(Tools.MuMech_ToSI(this.core.LastStage.totalDeltaV));
hudString.Append("m/s");
hudString.Append('\n');
hudString.Append("Bottom Stage Delta-V");
- hudString.Append(Tools.MuMech_ToSI(SimManager.LastStage.deltaV));
+ hudString.Append(Tools.MuMech_ToSI(this.core.LastStage.deltaV));
hudString.Append("m/s");
hudString.Append('\n');
hudString.Append("Bottom Stage T/W Ratio: ");
- hudString.Append(SimManager.LastStage.thrustToWeight.ToString("F3"));
+ hudString.Append(this.core.LastStage.thrustToWeight.ToString("F3"));
if (this.CoMmarker.gameObject.activeInHierarchy && this.CoTmarker.gameObject.activeInHierarchy)
{
--- a/VOID_HUD.cs
+++ b/VOID_HUD.cs
@@ -85,7 +85,7 @@
{
this._Name = "Heads-Up Display";
- this._Active.value = true;
+ this.toggleActive = true;
this._colorIndex = 0;
@@ -216,6 +216,8 @@
this.core.LabelStyles["hud"].normal.textColor = textColors [ColorIndex];
+ GUI.skin = this.core.Skin;
+
if ((TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate))
{
SimManager.RequestSimulation();
--- a/VOID_HUDAdvanced.cs
+++ b/VOID_HUDAdvanced.cs
@@ -78,7 +78,7 @@
{
this._Name = "Advanced Heads-Up Display";
- this._Active.value = true;
+ this.toggleActive = true;
this.leftHUDdefaultPos = new Rect(
Screen.width * .5f - (float)GameSettings.UI_SIZE * .25f - 300f,
@@ -433,18 +433,18 @@
"Nominal Stage Thrust",
delegate()
{
- if (SimManager.LastStage == null)
+ if (core.LastStage == null)
{
return double.NaN;
}
- if (SimManager.LastStage.actualThrust == 0d)
- {
- return SimManager.LastStage.thrust;
- }
- else
- {
- return SimManager.LastStage.actualThrust;
+ if (core.LastStage.actualThrust == 0d)
+ {
+ return core.LastStage.thrust;
+ }
+ else
+ {
+ return core.LastStage.actualThrust;
}
},
"kN"
@@ -454,12 +454,12 @@
"Stage Mass Flow",
delegate()
{
- if (SimManager.LastStage == null)
+ if (core.LastStage == null)
{
return double.NaN;
}
- double stageIsp = SimManager.LastStage.isp;
+ double stageIsp = core.LastStage.isp;
double stageThrust = stageNominalThrust;
Tools.PostDebugMessage(typeof(VOID_Data), "calculating stageMassFlow from:\n" +
@@ -528,7 +528,7 @@
"Total Burn Time",
delegate()
{
- if (SimManager.LastStage == null || currManeuverDeltaV.Value == double.NaN)
+ if (core.LastStage == null || currManeuverDeltaV.Value == double.NaN)
{
return double.NaN;
}
@@ -544,7 +544,7 @@
"Burn Time Remaining",
delegate()
{
- if (SimManager.LastStage == null || currManeuverDVRemaining == double.NaN)
+ if (core.LastStage == null || currManeuverDVRemaining == double.NaN)
{
return double.NaN;
}
@@ -560,7 +560,7 @@
"Half Burn Time",
delegate()
{
- if (SimManager.LastStage == null || currManeuverDeltaV.Value == double.NaN)
+ if (core.LastStage == null || currManeuverDeltaV.Value == double.NaN)
{
return double.NaN;
}
@@ -576,7 +576,7 @@
"Full burn time to be half done at node",
delegate()
{
- if (SimManager.LastStage == null && upcomingManeuverNodes < 1)
+ if (core.LastStage == null && upcomingManeuverNodes < 1)
{
return "N/A";
}
@@ -617,7 +617,7 @@
"Full burn time to be half done at node",
delegate()
{
- if (SimManager.LastStage == null && upcomingManeuverNodes < 1)
+ if (core.LastStage == null && upcomingManeuverNodes < 1)
{
return "N/A";
}
@@ -630,6 +630,11 @@
}
double interval = (node.UT - currentNodeHalfBurnDuration) - Planetarium.GetUniversalTime();
+
+ if (double.IsNaN(interval))
+ {
+ return string.Intern("NaN");
+ }
int sign = Math.Sign(interval);
interval = Math.Abs(interval);
--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -215,9 +215,17 @@
public abstract class VOID_WindowModule : VOID_Module
{
[AVOID_SaveValue("WindowPos")]
- protected Rect WindowPos = new Rect(Screen.width / 2, Screen.height / 2, 250f, 50f);
- protected float defWidth = 250f;
- protected float defHeight = 50f;
+ protected Rect WindowPos;
+ protected float defWidth;
+ protected float defHeight;
+
+ public VOID_WindowModule() : base()
+ {
+ this.defWidth = 250f;
+ this.defHeight = 50f;
+
+ this.WindowPos = new Rect(Screen.width / 2, Screen.height / 2, this.defWidth, this.defHeight);
+ }
public abstract void ModuleWindow(int _);
@@ -231,7 +239,9 @@
this.core.windowID,
_Pos,
VOID_Tools.GetWindowHandler(this.ModuleWindow),
- this.Name
+ this.Name,
+ GUILayout.Width(this.defWidth),
+ GUILayout.Height(this.defHeight)
);
_Pos = Tools.ClampRectToScreen (_Pos);
--- a/VOID_Rendezvous.cs
+++ b/VOID_Rendezvous.cs
@@ -130,7 +130,7 @@
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label(" ", GUILayout.ExpandWidth(true));
- if (GUILayout.Button("Close", GUILayout.ExpandWidth(false))) this._Active = false;
+ if (GUILayout.Button("Close", GUILayout.ExpandWidth(false))) this.toggleActive = false;
GUILayout.EndHorizontal();
GUILayout.EndVertical();
--- a/VOID_Tools.cs
+++ b/VOID_Tools.cs
@@ -334,14 +334,30 @@
{
func(id);
}
+ #if DEBUG
catch (ArgumentException ex)
+ #else
+ catch (ArgumentException)
+ #endif
{
Debug.LogWarning(
- string.Format("[{0}]: ArgumentException caught during window call.", func.Target.GetType().Name)
- );
+ string.Format("[{0}]: ArgumentException caught during window call. This is not a bug.",
+ func.Target.GetType().Name
+ ));
+
/*#if DEBUG
Debug.LogException(ex);
#endif*/
+ }
+ catch (Exception ex)
+ {
+ Debug.LogError(
+ string.Format("[{0}]: {1} caught during window call.\nMessage:\n{2}\nStackTrace:\n{3}",
+ func.Target.GetType().Name,
+ ex.GetType().Name,
+ ex.Message,
+ ex.StackTrace
+ ));
}
};
}
--- a/VOID_Transfer.cs
+++ b/VOID_Transfer.cs
@@ -39,7 +39,7 @@
{
protected List<CelestialBody> selectedBodies = new List<CelestialBody>();
- public VOID_Transfer()
+ public VOID_Transfer() : base()
{
this._Name = "Transfer Angle Information";
--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -66,7 +66,9 @@
VOID_Data.totalMass.DoGUIHorizontal ("F3");
- VOID_Data.comboResourceMass.DoGUIHorizontal ();
+ VOID_Data.stageResourceMass.DoGUIHorizontal("F2");
+
+ VOID_Data.resourceMass.DoGUIHorizontal("F2");
VOID_Data.stageDeltaV.DoGUIHorizontal (3, false);
@@ -106,12 +108,12 @@
"Total Mass",
delegate()
{
- if (SimManager.Stages == null || SimManager.LastStage == null)
+ if (core.Stages == null || core.LastStage == null)
{
return double.NaN;
}
- return SimManager.LastStage.totalMass;
+ return core.LastStage.totalMass;
},
"tons"
);
@@ -120,26 +122,26 @@
"Resource Mass",
delegate()
{
- if (SimManager.Stages == null || SimManager.LastStage == null)
+ if (core.Stages == null || core.LastStage == null)
{
return double.NaN;
}
- return SimManager.LastStage.totalMass - SimManager.LastStage.totalBaseMass;
+ return core.LastStage.totalMass - core.LastStage.totalBaseMass;
},
"tons"
);
public static readonly VOID_DoubleValue stageResourceMass = new VOID_DoubleValue(
- "Resource Mass (Current Stage)",
- delegate()
- {
- if (SimManager.LastStage == null)
+ "Resource Mass (Stage)",
+ delegate()
+ {
+ if (core.LastStage == null)
{
return double.NaN;
}
- return SimManager.LastStage.mass - SimManager.LastStage.baseMass;
+ return core.LastStage.mass - core.LastStage.baseMass;
},
"tons"
);
@@ -159,9 +161,9 @@
"DeltaV (Current Stage)",
delegate()
{
- if (SimManager.Stages == null || SimManager.LastStage == null)
- return double.NaN;
- return SimManager.LastStage.deltaV;
+ if (core.Stages == null || core.LastStage == null)
+ return double.NaN;
+ return core.LastStage.deltaV;
},
"m/s"
);
@@ -170,9 +172,9 @@
"DeltaV (Total)",
delegate()
{
- if (SimManager.Stages == null || SimManager.LastStage == null)
- return double.NaN;
- return SimManager.LastStage.totalDeltaV;
+ if (core.Stages == null || core.LastStage == null)
+ return double.NaN;
+ return core.LastStage.totalDeltaV;
},
"m/s"
);
@@ -187,11 +189,11 @@
"Thrust (curr/max)",
delegate()
{
- if (SimManager.Stages == null || SimManager.LastStage == null)
+ if (core.Stages == null || core.LastStage == null)
return "N/A";
- double currThrust = SimManager.LastStage.actualThrust;
- double maxThrust = SimManager.LastStage.thrust;
+ double currThrust = core.LastStage.actualThrust;
+ double maxThrust = core.LastStage.thrust;
return string.Format(
"{0} / {1}",
@@ -205,12 +207,12 @@
"T:W Ratio",
delegate()
{
- if (SimManager.LastStage == null)
+ if (core.LastStage == null)
{
return double.NaN;
}
- return SimManager.LastStage.actualThrustToWeight;
+ return core.LastStage.actualThrustToWeight;
},
""
);
@@ -219,12 +221,12 @@
"T:W Ratio",
delegate()
{
- if (SimManager.LastStage == null)
+ if (core.LastStage == null)
{
return double.NaN;
}
- return SimManager.LastStage.thrustToWeight;
+ return core.LastStage.thrustToWeight;
},
""
);
@@ -233,7 +235,7 @@
"T:W (curr/max)",
delegate()
{
- if (SimManager.Stages == null || SimManager.LastStage == null)
+ if (core.Stages == null || core.LastStage == null)
return "N/A";
return string.Format(
@@ -248,11 +250,11 @@
"Max T:W @ surface",
delegate()
{
- if (SimManager.Stages == null || SimManager.LastStage == null)
- return double.NaN;
-
- double maxThrust = SimManager.LastStage.thrust;
- double mass = SimManager.LastStage.totalMass;
+ if (core.Stages == null || core.LastStage == null)
+ return double.NaN;
+
+ double maxThrust = core.LastStage.thrust;
+ double mass = core.LastStage.totalMass;
double gravity = (VOID_Core.Constant_G * core.vessel.mainBody.Mass) /
(core.vessel.mainBody.Radius * core.vessel.mainBody.Radius);
double weight = mass * gravity;
--- a/VOID_VesselRegister.cs
+++ b/VOID_VesselRegister.cs
@@ -58,7 +58,7 @@
}
}
- public VOID_VesselRegister()
+ public VOID_VesselRegister() : base()
{
this._Name = "Vessel Register";
@@ -142,7 +142,7 @@
if (_selectedVessel != v)
{
_selectedVessel = v; //set clicked vessel as selected_vessel
- this._Active.value = true; //turn bool on to open the window if closed
+ this.toggleActive = true; //turn bool on to open the window if closed
}
else
{