VOID_Core: Power consumption will no longer persist when the core is 'powered off'. Thanks to Shad0wCatcher for the bughunting.
--- a/ToolbarButtonWrapper.cs
+++ b/ToolbarButtonWrapper.cs
@@ -30,9 +30,99 @@
/// </summary>
internal class ToolbarButtonWrapper
{
- protected System.Type ToolbarManager;
- protected object TBManagerInstance;
- protected MethodInfo TBManagerAdd;
+ protected static System.Type ToolbarManager;
+ protected static object TBManagerInstance;
+ protected static MethodInfo TBManagerAdd;
+
+ /// <summary>
+ /// Wraps the ToolbarManager class, if present.
+ /// </summary>
+ /// <returns><c>true</c>, if ToolbarManager is wrapped, <c>false</c> otherwise.</returns>
+ protected static bool TryWrapToolbarManager()
+ {
+ if (ToolbarManager == null)
+ {
+ Tools.PostDebugMessage(string.Format(
+ "{0}: Loading ToolbarManager.",
+ "ToolbarButtonWrapper"
+ ));
+
+ ToolbarManager = AssemblyLoader.loadedAssemblies
+ .Select(a => a.assembly.GetExportedTypes())
+ .SelectMany(t => t)
+ .FirstOrDefault(t => t.FullName == "Toolbar.ToolbarManager");
+
+ Tools.PostDebugMessage(string.Format(
+ "{0}: Loaded ToolbarManager. Getting Instance.",
+ "ToolbarButtonWrapper"
+ ));
+
+ if (ToolbarManager == null)
+ {
+ return false;
+ }
+
+ TBManagerInstance = ToolbarManager.GetProperty(
+ "Instance",
+ System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static
+ )
+ .GetValue(null, null);
+
+ Tools.PostDebugMessage(string.Format(
+ "{0}: Got ToolbarManager Instance '{1}'. Getting 'add' method.",
+ "ToolbarButtonWrapper",
+ TBManagerInstance
+ ));
+
+ TBManagerAdd = ToolbarManager.GetMethod("add");
+
+ Tools.PostDebugMessage(string.Format(
+ "{0}: Got ToolbarManager Instance 'add' method. Loading IButton.",
+ "ToolbarButtonWrapper"
+ ));
+ }
+
+ return true;
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether <see cref="Toolbar.ToolbarManager"/> is present.
+ /// </summary>
+ /// <value><c>true</c>, if ToolbarManager is wrapped, <c>false</c> otherwise.</value>
+ public static bool ToolbarManagerPresent
+ {
+ get
+ {
+ return TryWrapToolbarManager();
+ }
+ }
+
+ /// <summary>
+ /// If ToolbarManager is present, initializes a new instance of the <see cref="VOID.ToolbarButtonWrapper"/> class.
+ /// </summary>
+ /// <param name="ns">Namespace, usually the plugin name.</param>
+ /// <param name="id">Identifier, unique per namespace.</param>
+ /// <returns>If ToolbarManager is present, a new <see cref="Toolbar.IButton"/> object, <c>null</c> otherwise.</returns>
+ public static ToolbarButtonWrapper TryWrapToolbarButton(string ns, string id)
+ {
+ if (ToolbarManagerPresent)
+ {
+ object button = TBManagerAdd.Invoke(TBManagerInstance, new object[] { ns, id });
+
+ Tools.PostDebugMessage(string.Format(
+ "{0}: Added Button '{1}' with ToolbarManager. Getting 'Text' property",
+ "ToolbarButtonWrapper",
+ button.ToString()
+ ));
+
+ return new ToolbarButtonWrapper(button);
+ }
+ else
+ {
+ return null;
+ }
+ }
+
protected System.Type IButton;
protected object Button;
protected PropertyInfo ButtonText;
@@ -41,10 +131,12 @@
protected PropertyInfo ButtonToolTip;
protected PropertyInfo ButtonVisible;
protected PropertyInfo ButtonVisibility;
+ protected PropertyInfo ButtonEffectivelyVisible;
protected PropertyInfo ButtonEnalbed;
protected PropertyInfo ButtonImportant;
protected EventInfo ButtonOnClick;
- protected System.Type ClickHandlerType;
+ protected EventInfo ButtonOnMouseEnter;
+ protected EventInfo ButtonOnMouseLeave;
protected MethodInfo ButtonDestroy;
protected System.Type GameScenesVisibilityType;
@@ -152,6 +244,22 @@
}
/// <summary>
+ /// Whether this button is currently effectively visible or not. This is a combination of
+ /// <see cref="Visible"/> and <see cref="Visibility"/>.
+ /// </summary>
+ /// <remarks>
+ /// Note that the toolbar is not visible in certain game scenes, for example the loading screens. This property
+ /// does not reflect button invisibility in those scenes.
+ /// </remarks>
+ public bool EffectivelyVisible
+ {
+ get
+ {
+ return (bool)this.ButtonEffectivelyVisible.GetValue(this.Button, null);
+ }
+ }
+
+ /// <summary>
/// Whether this button is currently enabled (clickable) or not. This will not affect the player's ability to
/// position the button on their screen.
/// </summary>
@@ -207,41 +315,9 @@
/// </summary>
/// <param name="ns">Namespace, usually the plugin name.</param>
/// <param name="id">Identifier, unique per namespace.</param>
- public ToolbarButtonWrapper(string ns, string id)
- {
- Tools.PostDebugMessage(string.Format(
- "{0}: Loading ToolbarManager.",
- this.GetType().Name
- ));
-
- this.ToolbarManager = AssemblyLoader.loadedAssemblies
- .Select(a => a.assembly.GetExportedTypes())
- .SelectMany(t => t)
- .FirstOrDefault(t => t.FullName == "Toolbar.ToolbarManager");
-
- Tools.PostDebugMessage(string.Format(
- "{0}: Loaded ToolbarManager. Getting Instance.",
- this.GetType().Name
- ));
-
- this.TBManagerInstance = this.ToolbarManager.GetProperty(
- "Instance",
- System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static
- )
- .GetValue(null, null);
-
- Tools.PostDebugMessage(string.Format(
- "{0}: Got ToolbarManager Instance '{1}'. Getting 'add' method.",
- this.GetType().Name,
- this.TBManagerInstance
- ));
-
- this.TBManagerAdd = this.ToolbarManager.GetMethod("add");
-
- Tools.PostDebugMessage(string.Format(
- "{0}: Got ToolbarManager Instance 'add' method. Loading IButton.",
- this.GetType().Name
- ));
+ protected ToolbarButtonWrapper(object button)
+ {
+ this.Button = button;
this.IButton = AssemblyLoader.loadedAssemblies
.Select(a => a.assembly.GetExportedTypes())
@@ -253,14 +329,6 @@
this.GetType().Name
));
- this.Button = this.TBManagerAdd.Invoke(this.TBManagerInstance, new object[] { ns, id });
-
- Tools.PostDebugMessage(string.Format(
- "{0}: Added Button '{1}' with ToolbarManager. Getting 'Text' property",
- this.GetType().Name,
- this.Button.ToString()
- ));
-
this.ButtonText = this.IButton.GetProperty("Text");
Tools.PostDebugMessage(string.Format(
@@ -299,6 +367,13 @@
this.ButtonVisibility = this.IButton.GetProperty("Visibility");
Tools.PostDebugMessage(string.Format(
+ "{0}: Got 'Visibility' property. Getting 'EffectivelyVisible' property.",
+ this.GetType().Name
+ ));
+
+ this.ButtonEffectivelyVisible = this.IButton.GetProperty("EffectivelyVisible");
+
+ Tools.PostDebugMessage(string.Format(
"{0}: Got 'Visibility' property. Getting 'Enabled' property.",
this.GetType().Name
));
@@ -318,13 +393,28 @@
));
this.ButtonOnClick = this.IButton.GetEvent("OnClick");
- this.ClickHandlerType = this.ButtonOnClick.EventHandlerType;
-
- Tools.PostDebugMessage(string.Format(
- "{0}: Got 'OnClick' event '{1}'. Getting 'Destroy' method.",
+
+ Tools.PostDebugMessage(string.Format(
+ "{0}: Got 'OnClick' event '{1}'. Getting 'OnMouseEnter' event.",
this.GetType().Name,
this.ButtonOnClick.ToString()
));
+
+ this.ButtonOnMouseEnter = this.IButton.GetEvent("OnMouseEnter");
+
+ Tools.PostDebugMessage(string.Format(
+ "{0}: Got 'OnMouseEnter' event '{1}'. Getting 'OnMouseLeave' event.",
+ this.GetType().Name,
+ this.ButtonOnClick.ToString()
+ ));
+
+ this.ButtonOnMouseLeave = this.IButton.GetEvent("OnMouseLeave");
+
+ Tools.PostDebugMessage(string.Format(
+ "{0}: Got 'OnMouseLeave' event '{1}'. Getting 'Destroy' method.",
+ this.GetType().Name,
+ this.ButtonOnClick.ToString()
+ ));
this.ButtonDestroy = this.IButton.GetMethod("Destroy");
@@ -365,9 +455,47 @@
/// <param name="Handler">Delegate to handle "on click" events</param>
public void AddButtonClickHandler(Action<object> Handler)
{
- Delegate d = Delegate.CreateDelegate(this.ClickHandlerType, Handler.Target, Handler.Method);
- MethodInfo addHandler = this.ButtonOnClick.GetAddMethod();
- addHandler.Invoke(this.Button, new object[] { d });
+ this.AddButtonEventHandler(this.ButtonOnClick, Handler);
+ }
+
+ /// <summary>
+ /// Adds event handler that can be registered with to receive "on mouse enter" events.
+ /// </summary>
+ /// <example>
+ /// <code>
+ /// ToolbarWrapperButton button = ...
+ /// button.AddButtonOnMouseEnterHandler(
+ /// (e) =>
+ /// {
+ /// Debug.Log("mouse entered button");
+ /// }
+ /// );
+ /// </code>
+ /// </example>
+ /// <param name="Handler">Delegate to handle "OnMouseEnter" events.</param>
+ public void AddButtonOnMouseEnterHandler(Action<object> Handler)
+ {
+ this.AddButtonEventHandler(this.ButtonOnMouseEnter, Handler);
+ }
+
+ /// <summary>
+ /// Adds event handler that can be registered with to receive "on mouse leave" events.
+ /// </summary>
+ /// <example>
+ /// <code>
+ /// ToolbarWrapperButton button = ...
+ /// button.AddButtonOnMouseLeaveHandler(
+ /// (e) =>
+ /// {
+ /// Debug.Log("mouse left button");
+ /// }
+ /// );
+ /// </code>
+ /// </example>
+ /// <param name="Handler">Delegate to handle "OnMouseLeave" events.</param>
+ public void AddButtonOnMouseLeaveHandler(Action<object> Handler)
+ {
+ this.AddButtonEventHandler(this.ButtonOnMouseLeave, Handler);
}
/// <summary>
@@ -388,6 +516,14 @@
{
this.ButtonDestroy.Invoke(this.Button, null);
}
+
+ // Utility method for use with the AddButton<event>Handler API methods.
+ protected void AddButtonEventHandler(EventInfo Event, Action<object> Handler)
+ {
+ Delegate d = Delegate.CreateDelegate(Event.EventHandlerType, Handler.Target, Handler.Method);
+ MethodInfo addHandler = Event.GetAddMethod();
+ addHandler.Invoke(this.Button, new object[] { d });
+ }
}
}
--- a/Tools.cs
+++ b/Tools.cs
@@ -209,7 +209,17 @@
//From http://svn.mumech.com/KSP/trunk/MuMechLib/VOID.vesselState.cs
public static double MuMech_get_heading(Vessel vessel)
{
- Vector3d CoM = vessel.findWorldCenterOfMass();
+ Vector3d CoM;
+
+ try
+ {
+ CoM = vessel.findWorldCenterOfMass();
+ }
+ catch
+ {
+ return double.NaN;
+ }
+
Vector3d up = (CoM - vessel.mainBody.position).normalized;
Vector3d north = Vector3d.Exclude(
up,
@@ -959,6 +969,59 @@
return icon;
}
+ public static ExperimentSituations GetExperimentSituation(this Vessel vessel)
+ {
+ Vessel.Situations situation = vessel.situation;
+
+ switch (situation)
+ {
+ case Vessel.Situations.PRELAUNCH:
+ case Vessel.Situations.LANDED:
+ return ExperimentSituations.SrfLanded;
+ case Vessel.Situations.SPLASHED:
+ return ExperimentSituations.SrfSplashed;
+ case Vessel.Situations.FLYING:
+ if (vessel.altitude < (double)vessel.mainBody.scienceValues.flyingAltitudeThreshold)
+ {
+ return ExperimentSituations.FlyingLow;
+ }
+ else
+ {
+ return ExperimentSituations.FlyingHigh;
+ }
+ }
+
+ if (vessel.altitude < (double)vessel.mainBody.scienceValues.spaceAltitudeThreshold)
+ {
+ return ExperimentSituations.InSpaceLow;
+ }
+ else
+ {
+ return ExperimentSituations.InSpaceHigh;
+ }
+ }
+
+ public static string HumanString(this ExperimentSituations situation)
+ {
+ switch (situation)
+ {
+ case ExperimentSituations.FlyingHigh:
+ return "Upper Atmosphere";
+ case ExperimentSituations.FlyingLow:
+ return "Flying";
+ case ExperimentSituations.SrfLanded:
+ return "Surface";
+ case ExperimentSituations.InSpaceLow:
+ return "Near in Space";
+ case ExperimentSituations.InSpaceHigh:
+ return "High in Space";
+ case ExperimentSituations.SrfSplashed:
+ return "Splashed Down";
+ default:
+ return "Unknown";
+ }
+ }
+
private static ScreenMessage debugmsg = new ScreenMessage("", 2f, ScreenMessageStyle.UPPER_RIGHT);
[System.Diagnostics.Conditional("DEBUG")]
--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -69,53 +69,68 @@
* Fields
* */
protected string VoidName = "VOID";
- protected string VoidVersion = "0.9.17";
+ protected string VoidVersion = "0.9.20";
+
protected bool _factoryReset = false;
+
[AVOID_SaveValue("configValue")]
protected VOID_SaveValue<int> configVersion = 1;
+
protected List<IVOID_Module> _modules = new List<IVOID_Module>();
protected bool _modulesLoaded = false;
+
[AVOID_SaveValue("mainWindowPos")]
protected VOID_SaveValue<Rect> mainWindowPos = new Rect(475, 575, 10f, 10f);
[AVOID_SaveValue("mainGuiMinimized")]
protected VOID_SaveValue<bool> mainGuiMinimized = false;
+
[AVOID_SaveValue("configWindowPos")]
protected VOID_SaveValue<Rect> configWindowPos = new Rect(825, 625, 10f, 10f);
[AVOID_SaveValue("configWindowMinimized")]
+
protected VOID_SaveValue<bool> configWindowMinimized = true;
[AVOID_SaveValue("VOIDIconPos")]
protected VOID_SaveValue<Rect> VOIDIconPos = new Rect(Screen.width / 2 - 200, Screen.height - 32, 32f, 32f);
- protected Texture2D VOIDIconOff;
- protected Texture2D VOIDIconOn;
+
protected Texture2D VOIDIconTexture;
- protected string VOIDIconOnPath = "VOID/Textures/void_icon_on";
- protected string VOIDIconOffPath = "VOID/Textures/void_icon_off";
+ protected string VOIDIconOnActivePath;
+ protected string VOIDIconOnInactivePath;
+ protected string VOIDIconOffActivePath;
+ protected string VOIDIconOffInactivePath;
+
protected bool VOIDIconLocked = true;
+
protected GUIStyle iconStyle;
+
protected int windowBaseID = -96518722;
protected int _windowID = 0;
+
protected bool GUIStylesLoaded = false;
protected Dictionary<string, GUIStyle> _LabelStyles = new Dictionary<string, GUIStyle>();
+
[AVOID_SaveValue("togglePower")]
public VOID_SaveValue<bool> togglePower = true;
public bool powerAvailable = true;
+
[AVOID_SaveValue("consumeResource")]
protected VOID_SaveValue<bool> consumeResource = false;
+
[AVOID_SaveValue("resourceName")]
protected VOID_SaveValue<string> resourceName = "ElectricCharge";
+
[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>();
- protected bool bodiesLoaded = false;
+
// Vessel Type Housekeeping
protected List<VesselType> _allVesselTypes = new List<VesselType>();
protected bool vesselTypesLoaded = false;
public float saveTimer = 0;
+
protected string defaultSkin = "KSP window 2";
[AVOID_SaveValue("defaultSkin")]
protected VOID_SaveValue<string> _skinName;
@@ -133,11 +148,14 @@
"PartTooltipSkin"
};
protected bool skinsLoaded = false;
+
public bool configDirty;
+
[AVOID_SaveValue("UseBlizzyToolbar")]
protected VOID_SaveValue<bool> _UseToolbarManager;
- protected bool ToolbarManagerLoaded = false;
+ protected bool ToolbarManagerLoaded;
internal ToolbarButtonWrapper ToolbarButton;
+
/*
* Properties
* */
@@ -193,7 +211,7 @@
{
get
{
- return this._allBodies;
+ return FlightGlobals.Bodies;
}
}
@@ -221,6 +239,38 @@
}
}
+ protected IconState powerState
+ {
+ get
+ {
+ if (this.togglePower && this.powerAvailable)
+ {
+ return IconState.PowerOn;
+ }
+ else
+ {
+ return IconState.PowerOff;
+ }
+
+ }
+ }
+
+ protected IconState activeState
+ {
+ get
+ {
+ if (this.mainGuiMinimized)
+ {
+ return IconState.Inactive;
+ }
+ else
+ {
+ return IconState.Active;
+ }
+
+ }
+ }
+
protected bool UseToolbarManager
{
get
@@ -229,6 +279,11 @@
}
set
{
+ if (this._UseToolbarManager == value)
+ {
+ return;
+ }
+
if (value == false && this.ToolbarManagerLoaded && this.ToolbarButton != null)
{
this.ToolbarButton.Destroy();
@@ -239,9 +294,12 @@
this.InitializeToolbarButton();
}
+ this.SetIconTexture(this.powerState | this.activeState);
+
_UseToolbarManager.value = value;
}
}
+
/*
* Methods
* */
@@ -251,14 +309,19 @@
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.VOIDIconOnActivePath = "VOID/Textures/void_icon_light_glow";
+ this.VOIDIconOnInactivePath = "VOID/Textures/void_icon_dark_glow";
+ this.VOIDIconOffActivePath = "VOID/Textures/void_icon_light";
+ this.VOIDIconOffInactivePath = "VOID/Textures/void_icon_dark";
+
this.UseToolbarManager = false;
+ this.ToolbarManagerLoaded = false;
this.LoadConfig();
+
+ this.SetIconTexture(this.powerState | this.activeState);
}
protected void LoadModulesOfType<T>()
@@ -401,12 +464,6 @@
this.GUIStylesLoaded = true;
}
- protected void LoadAllBodies()
- {
- this._allBodies = FlightGlobals.Bodies;
- this.bodiesLoaded = true;
- }
-
protected void LoadVesselTypes()
{
this._allVesselTypes = Enum.GetValues(typeof(VesselType)).OfType<VesselType>().ToList();
@@ -415,11 +472,6 @@
protected void LoadBeforeUpdate()
{
- if (!this.bodiesLoaded)
- {
- this.LoadAllBodies();
- }
-
if (!this.vesselTypesLoaded)
{
this.LoadVesselTypes();
@@ -428,31 +480,19 @@
protected void LoadToolbarManager()
{
- Type ToolbarManager = AssemblyLoader.loadedAssemblies
- .Select(a => a.assembly.GetExportedTypes())
- .SelectMany(t => t)
- .FirstOrDefault(t => t.FullName == "Toolbar.ToolbarManager");
-
- if (ToolbarManager == null)
- {
- Tools.PostDebugMessage(string.Format(
- "{0}: Could not load ToolbarManager.",
- this.GetType().Name
- ));
-
- return;
- }
-
- this.InitializeToolbarButton();
-
- this.ToolbarManagerLoaded = true;
+ this.ToolbarManagerLoaded = ToolbarButtonWrapper.ToolbarManagerPresent;
+
+ if (this.ToolbarManagerLoaded)
+ {
+ this.InitializeToolbarButton();
+ }
}
protected void InitializeToolbarButton()
{
- this.ToolbarButton = new ToolbarButtonWrapper(this.GetType().Name, "coreToggle");
+ this.ToolbarButton = ToolbarButtonWrapper.TryWrapToolbarButton(this.GetType().Name, "coreToggle");
this.ToolbarButton.Text = this.VoidName;
- this.ToolbarButton.TexturePath = this.VOIDIconOffPath + "_24x24";
+ this.ToolbarButton.TexturePath = this.VOIDIconOffActivePath;
if (this is VOID_EditorCore)
{
this.ToolbarButton.SetButtonVisibility(new GameScenes[] { GameScenes.EDITOR });
@@ -462,7 +502,11 @@
this.ToolbarButton.SetButtonVisibility(new GameScenes[] { GameScenes.FLIGHT });
}
this.ToolbarButton.AddButtonClickHandler(
- (e) => this.mainGuiMinimized = !this.mainGuiMinimized
+ (e) =>
+ {
+ this.mainGuiMinimized = !this.mainGuiMinimized;
+ this.SetIconTexture(this.powerState | this.activeState);
+ }
);
}
@@ -478,7 +522,10 @@
if (togglePower)
str = "OFF";
if (GUILayout.Button("Power " + str))
+ {
togglePower.value = !togglePower;
+ this.SetIconTexture(this.powerState | this.activeState);
+ }
}
if (togglePower || HighLogic.LoadedSceneIsEditor)
@@ -637,28 +684,18 @@
this.LoadGUIStyles();
}
- if (this.UseToolbarManager && this.ToolbarManagerLoaded)
- {
- this.ToolbarButton.TexturePath = VOIDIconOffPath;
- if (this.togglePower)
- {
- this.ToolbarButton.TexturePath = VOIDIconOnPath;
- }
- }
- else
- {
- this.VOIDIconTexture = this.VOIDIconOff; //icon off default
- if (this.togglePower)
- this.VOIDIconTexture = this.VOIDIconOn; //or on if power_toggle==true
-
+ if (!(this.UseToolbarManager && this.ToolbarManagerLoaded))
+ {
if (GUI.Button(VOIDIconPos, VOIDIconTexture, this.iconStyle) && this.VOIDIconLocked)
{
this.mainGuiMinimized.value = !this.mainGuiMinimized;
+ this.SetIconTexture(this.powerState | this.activeState);
}
}
if (!this.mainGuiMinimized)
{
+
Rect _mainWindowPos = this.mainWindowPos;
_mainWindowPos = GUILayout.Window(
@@ -801,19 +838,30 @@
public void FixedUpdate()
{
- if (this.consumeResource &&
+ bool newPowerState = this.powerAvailable;
+
+ if (this.togglePower && this.consumeResource &&
this.vessel.vesselType != VesselType.EVA &&
TimeWarp.deltaTime != 0)
{
- float powerReceived = this.vessel.rootPart.RequestResource(this.resourceName,
- this.resourceRate * TimeWarp.fixedDeltaTime);
+ float powerReceived = this.vessel.rootPart.RequestResource(
+ this.resourceName,
+ this.resourceRate * TimeWarp.fixedDeltaTime
+ );
+
if (powerReceived > 0)
{
- this.powerAvailable = true;
+ newPowerState = true;
}
else
{
- this.powerAvailable = false;
+ newPowerState = false;
+ }
+
+ if (this.powerAvailable != newPowerState)
+ {
+ this.powerAvailable = newPowerState;
+ this.SetIconTexture(this.powerState | this.activeState);
}
}
@@ -835,6 +883,39 @@
}
this.StartGUI();
+ }
+
+ protected void SetIconTexture(IconState state)
+ {
+ switch (state)
+ {
+ case (IconState.PowerOff | IconState.Inactive):
+ this.SetIconTexture(this.VOIDIconOffInactivePath);
+ break;
+ case (IconState.PowerOff | IconState.Active):
+ this.SetIconTexture(this.VOIDIconOffActivePath);
+ break;
+ case (IconState.PowerOn | IconState.Inactive):
+ this.SetIconTexture(this.VOIDIconOnInactivePath);
+ break;
+ case (IconState.PowerOn | IconState.Active):
+ this.SetIconTexture(this.VOIDIconOnActivePath);
+ break;
+ default:
+ throw new NotImplementedException();
+ }
+ }
+
+ protected void SetIconTexture(string texturePath)
+ {
+ if (this.UseToolbarManager && this.ToolbarButton != null)
+ {
+ this.ToolbarButton.TexturePath = texturePath;
+ }
+ else
+ {
+ this.VOIDIconTexture = GameDatabase.Instance.GetTexture(texturePath, false);
+ }
}
protected void CheckAndSave()
@@ -885,6 +966,14 @@
this.configDirty = false;
}
+
+ protected enum IconState
+ {
+ PowerOff = 1,
+ PowerOn = 2,
+ Inactive = 4,
+ Active = 8
+ }
}
}
--- a/VOID_EditorHUD.cs
+++ b/VOID_EditorHUD.cs
@@ -24,6 +24,8 @@
using KSP;
using System;
using System.Collections.Generic;
+using System.Linq;
+using System.Text;
using UnityEngine;
namespace VOID
@@ -40,6 +42,8 @@
protected GUIStyle labelStyle;
+ protected EditorVesselOverlays _vesselOverlays;
+
/*
* Properties
* */
@@ -58,6 +62,47 @@
}
this._colorIndex = value;
+ }
+ }
+
+ protected EditorVesselOverlays vesselOverlays
+ {
+ get
+ {
+ if (this._vesselOverlays == null)
+ {
+ this._vesselOverlays = (EditorVesselOverlays)Resources
+ .FindObjectsOfTypeAll(typeof(EditorVesselOverlays))
+ .FirstOrDefault();
+ }
+
+ return this._vesselOverlays;
+ }
+ }
+
+ protected EditorMarker_CoM CoMmarker
+ {
+ get
+ {
+ if (this.vesselOverlays == null)
+ {
+ return null;
+ }
+
+ return this.vesselOverlays.CoMmarker;
+ }
+ }
+
+ protected EditorMarker_CoT CoTmarker
+ {
+ get
+ {
+ if (this.vesselOverlays == null)
+ {
+ return null;
+ }
+
+ return this.vesselOverlays.CoTmarker;
}
}
@@ -97,6 +142,7 @@
}
float hudLeft;
+ StringBuilder hudString;
if (EditorLogic.fetch.editorScreen == EditorLogic.EditorScreen.Parts)
{
@@ -113,17 +159,53 @@
Rect hudPos = new Rect (hudLeft, 48, 300, 32);
+ hudString = new StringBuilder();
+
// GUI.skin = AssetBase.GetGUISkin("KSP window 2");
labelStyle.normal.textColor = textColors [ColorIndex];
+
+ hudString.Append("Total Mass: ");
+ hudString.Append(SimManager.Instance.LastStage.totalMass.ToString("F3"));
+ hudString.Append('t');
+
+ hudString.Append(' ');
+
+ hudString.Append("Part Count: ");
+ hudString.Append(EditorLogic.SortedShipList.Count);
+
+ hudString.Append('\n');
+
+ hudString.Append("Total Delta-V: ");
+ hudString.Append(Tools.MuMech_ToSI(SimManager.Instance.LastStage.totalDeltaV));
+ hudString.Append("m/s");
+
+ hudString.Append('\n');
+
+ hudString.Append("Bottom Stage Delta-V");
+ hudString.Append(Tools.MuMech_ToSI(SimManager.Instance.LastStage.deltaV));
+ hudString.Append("m/s");
+
+ hudString.Append('\n');
+
+ hudString.Append("Bottom Stage T/W Ratio: ");
+ hudString.Append(SimManager.Instance.LastStage.thrustToWeight.ToString("F3"));
+
+ if (this.CoMmarker.gameObject.activeInHierarchy && this.CoTmarker.gameObject.activeInHierarchy)
+ {
+ hudString.Append('\n');
+
+ hudString.Append("Thrust Offset: ");
+ hudString.Append(
+ Vector3.Cross(
+ this.CoTmarker.dirMarkerObject.transform.forward,
+ this.CoMmarker.posMarkerObject.transform.position - this.CoTmarker.posMarkerObject.transform.position
+ ).ToString("F3"));
+ }
GUI.Label (
hudPos,
- "Total Mass: " + SimManager.Instance.LastStage.totalMass.ToString("F3") + "t" +
- " Part Count: " + EditorLogic.SortedShipList.Count +
- "\nTotal Delta-V: " + Tools.MuMech_ToSI(SimManager.Instance.LastStage.totalDeltaV) + "m/s" +
- "\nBottom Stage Delta-V: " + Tools.MuMech_ToSI(SimManager.Instance.LastStage.deltaV) + "m/s" +
- "\nBottom Stage T/W Ratio: " + SimManager.Instance.LastStage.thrustToWeight.ToString("F3"),
+ hudString.ToString(),
labelStyle);
}
--- a/VOID_HUD.cs
+++ b/VOID_HUD.cs
@@ -113,7 +113,8 @@
" Lon: " + Tools.GetLongitudeString (vessel, "F3") +
"\nHdg: " + Tools.MuMech_get_heading (vessel).ToString ("F2") + "° " +
Tools.get_heading_text (Tools.MuMech_get_heading (vessel)) +
- "\nBiome: " + Tools.Toadicus_GetAtt (vessel).name,
+ "\nBiome: " + Tools.Toadicus_GetAtt (vessel).name +
+ " Sit: " + vessel.GetExperimentSituation().HumanString(),
VOID_Core.Instance.LabelStyles["hud"]);
}
else
--- a/VOID_Rendezvous.cs
+++ b/VOID_Rendezvous.cs
@@ -138,7 +138,7 @@
{
// Toadicus edit: added local sidereal longitude.
// Toadicus edit: added local sidereal longitude.
- double LSL = vessel.longitude + vessel.orbit.referenceBody.rotationAngle;
+ double LSL = v.longitude + v.orbit.referenceBody.rotationAngle;
LSL = Tools.FixDegreeDomain (LSL);
//display orbital info for orbiting/flying/suborbital/escaping vessels only
--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -23,6 +23,7 @@
using System.Collections.Generic;
using UnityEngine;
using Engineer.VesselSimulator;
+using Engineer.Extensions;
namespace VOID
{
@@ -151,6 +152,51 @@
""
);
+ protected VOID_StrValue intakeAirStatus = new VOID_StrValue(
+ "Intake Air (Curr / Req)",
+ delegate()
+ {
+ double currentAmount;
+ double currentRequirement;
+
+ currentAmount = 0d;
+ currentRequirement = 0d;
+
+ foreach (Part part in VOID_Core.Instance.vessel.Parts)
+ {
+ if (part.HasModule<ModuleEngines>() && part.enabled)
+ {
+ foreach (Propellant propellant in part.GetModule<ModuleEngines>().propellants)
+ {
+ if (propellant.name == "IntakeAir")
+ {
+ // currentAmount += propellant.currentAmount;
+ currentRequirement += propellant.currentRequirement / TimeWarp.fixedDeltaTime;
+ break;
+ }
+ }
+ }
+
+ if (part.HasModule<ModuleResourceIntake>() && part.enabled)
+ {
+ ModuleResourceIntake intakeModule = part.GetModule<ModuleResourceIntake>();
+
+ if (intakeModule.resourceName == "IntakeAir")
+ {
+ currentAmount += intakeModule.airFlow;
+ }
+ }
+ }
+
+ if (currentAmount == 0 && currentRequirement == 0)
+ {
+ return "N/A";
+ }
+
+ return string.Format("{0:F3} / {1:F3}", currentAmount, currentRequirement);
+ }
+ );
+
public VOID_VesselInfo() : base()
{
this._Name = "Vessel Information";
@@ -196,6 +242,8 @@
this.currmaxThrustWeight.DoGUIHorizontal ();
this.surfaceThrustWeight.DoGUIHorizontal ("F2");
+
+ this.intakeAirStatus.DoGUIHorizontal();
GUILayout.EndVertical();
GUI.DragWindow();