ToolbarButtonWrapper: Added EffectivelyVisible.
VesselInfo: Added IntakeAir status indication.
--- 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,9 +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;
@@ -151,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>
@@ -166,48 +275,49 @@
}
}
- private ToolbarButtonWrapper() {}
+ /// <summary>
+ /// Whether this button is currently "important." Set to false to return to normal button behaviour.
+ /// </summary>
+ /// <remarks>
+ /// <para>
+ /// This can be used to temporarily force the button to be shown on the screen regardless of the toolbar being
+ /// currently in auto-hidden mode. For example, a button that signals the arrival of a private message in a
+ /// chat room could mark itself as "important" as long as the message has not been read.
+ /// </para>
+ /// <para>
+ /// Setting this property does not change the appearance of the button. use <see cref="TexturePath"/> to
+ /// change the button's icon.
+ /// </para>
+ /// <para>
+ /// This feature should be used only sparingly, if at all, since it forces the button to be displayed on screen
+ /// even when it normally wouldn't.
+ /// </para>
+ /// </remarks>
+ /// <value><c>true</c> if important; otherwise, <c>false</c>.</value>
+ public bool Important
+ {
+ get
+ {
+ return (bool)this.ButtonImportant.GetValue(this.Button, null);
+ }
+ set
+ {
+ this.ButtonImportant.SetValue(this.Button, value, null);
+ }
+ }
+
+ private ToolbarButtonWrapper()
+ {
+ }
/// <summary>
/// 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>
- 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())
@@ -217,81 +327,102 @@
Tools.PostDebugMessage(string.Format(
"{0}: Loaded IButton. Adding Button with ToolbarManager.",
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(
"{0}: Got 'Text' property. Getting 'TextColor' property.",
this.GetType().Name
- ));
+ ));
this.ButtonTextColor = this.IButton.GetProperty("TextColor");
Tools.PostDebugMessage(string.Format(
"{0}: Got 'TextColor' property. Getting 'TexturePath' property.",
this.GetType().Name
- ));
+ ));
this.ButtonTexturePath = this.IButton.GetProperty("TexturePath");
Tools.PostDebugMessage(string.Format(
"{0}: Got 'TexturePath' property. Getting 'ToolTip' property.",
this.GetType().Name
- ));
+ ));
this.ButtonToolTip = this.IButton.GetProperty("ToolTip");
Tools.PostDebugMessage(string.Format(
"{0}: Got 'ToolTip' property. Getting 'Visible' property.",
this.GetType().Name
- ));
+ ));
this.ButtonVisible = this.IButton.GetProperty("Visible");
Tools.PostDebugMessage(string.Format(
"{0}: Got 'Visible' property. Getting 'Visibility' property.",
this.GetType().Name
- ));
+ ));
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
- ));
+ ));
this.ButtonEnalbed = this.IButton.GetProperty("Enabled");
Tools.PostDebugMessage(string.Format(
"{0}: Got 'Enabled' property. Getting 'OnClick' event.",
this.GetType().Name
- ));
+ ));
+
+ this.ButtonImportant = this.IButton.GetProperty("Important");
+
+ Tools.PostDebugMessage(string.Format(
+ "{0}: Got 'Enabled' property. Getting 'OnClick' event.",
+ this.GetType().Name
+ ));
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");
Tools.PostDebugMessage(string.Format(
"{0}: Got 'Destroy' property '{1}'. Loading GameScenesVisibility class.",
this.GetType().Name,
this.ButtonDestroy.ToString()
- ));
+ ));
this.GameScenesVisibilityType = AssemblyLoader.loadedAssemblies
.Select(a => a.assembly.GetExportedTypes())
@@ -302,7 +433,7 @@
"{0}: Got 'GameScenesVisibility' class '{1}'.",
this.GetType().Name,
this.GameScenesVisibilityType.ToString()
- ));
+ ));
Tools.PostDebugMessage("ToolbarButtonWrapper built!");
}
@@ -324,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>
@@ -347,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
@@ -25,7 +25,6 @@
//
///////////////////////////////////////////////////////////////////////////////
-
using System;
using System.Collections.Generic;
using UnityEngine;
@@ -51,9 +50,13 @@
try
{
CBAttributeMap BiomeMap = vessel.mainBody.BiomeMap;
+
double lat = vessel.latitude * Math.PI / 180d;
double lon = vessel.longitude * Math.PI / 180d;
+ mapAttribute = BiomeMap.GetAtt(lat, lon);
+
+ /*
lon -= Math.PI / 2d;
if (lon < 0d)
@@ -64,7 +67,7 @@
float v = (float)(lat / Math.PI) + 0.5f;
float u = (float)(lon / (2d * Math.PI));
- Color pixelBilinear = BiomeMap.Map.GetPixelBilinear (u, v);
+ Color pixelBilinear = BiomeMap.Map.GetPixelBilinear(u, v);
mapAttribute = BiomeMap.defaultAttribute;
if (BiomeMap.Map != null)
@@ -85,7 +88,7 @@
float num = 1 / zero;
for (int j = 0; j < BiomeMap.Attributes.Length; ++j)
{
- Color mapColor = BiomeMap.Attributes [j].mapColor;
+ Color mapColor = BiomeMap.Attributes[j].mapColor;
float sqrMagnitude = ((Vector4)(mapColor - pixelBilinear)).sqrMagnitude;
if (sqrMagnitude < num)
{
@@ -103,6 +106,7 @@
}
}
}
+ */
}
catch (NullReferenceException)
{
@@ -113,7 +117,7 @@
return mapAttribute;
}
- public static string GetLongitudeString(Vessel vessel, string format="F4")
+ public static string GetLongitudeString(Vessel vessel, string format = "F4")
{
string dir_long = "W";
double v_long = vessel.longitude;
@@ -129,16 +133,18 @@
v_long -= 360d;
}
- if (v_long > 0) dir_long = "E";
+ if (v_long > 0)
+ dir_long = "E";
return string.Format("{0}° {1}", Math.Abs(v_long).ToString(format), dir_long);
}
- public static string GetLatitudeString(Vessel vessel, string format="F4")
+ public static string GetLatitudeString(Vessel vessel, string format = "F4")
{
string dir_lat = "S";
double v_lat = vessel.latitude;
- if (v_lat > 0) dir_lat = "N";
+ if (v_lat > 0)
+ dir_lat = "N";
return string.Format("{0}° {1}", Math.Abs(v_lat).ToString(format), dir_lat);
}
@@ -200,27 +206,25 @@
return value.ToString(format);
}
}
-
//From http://svn.mumech.com/KSP/trunk/MuMechLib/VOID.vesselState.cs
public static double MuMech_get_heading(Vessel vessel)
{
Vector3d CoM = vessel.findWorldCenterOfMass();
Vector3d up = (CoM - vessel.mainBody.position).normalized;
Vector3d north = Vector3d.Exclude(
- up,
- (vessel.mainBody.position +
- vessel.mainBody.transform.up * (float)vessel.mainBody.Radius
- ) - CoM).normalized;
+ up,
+ (vessel.mainBody.position +
+ vessel.mainBody.transform.up * (float)vessel.mainBody.Radius
+ ) - CoM).normalized;
Quaternion rotationSurface = Quaternion.LookRotation(north, up);
Quaternion rotationvesselSurface = Quaternion.Inverse(
- Quaternion.Euler(90, 0, 0) *
- Quaternion.Inverse(vessel.transform.rotation) *
- rotationSurface);
+ Quaternion.Euler(90, 0, 0) *
+ Quaternion.Inverse(vessel.transform.rotation) *
+ rotationSurface);
return rotationvesselSurface.eulerAngles.y;
}
-
//From http://svn.mumech.com/KSP/trunk/MuMechLib/MuUtils.cs
public static string MuMech_ToSI(
double d, int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue
@@ -233,76 +237,76 @@
{
switch ((int)Math.Floor(exponent))
{
- case 0:
- case 1:
- case 2:
- return d.ToString("F" + digits);
- case 3:
- case 4:
- case 5:
- return (d / 1e3).ToString("F" + digits) + "k";
- case 6:
- case 7:
- case 8:
- return (d / 1e6).ToString("F" + digits) + "M";
- case 9:
- case 10:
- case 11:
- return (d / 1e9).ToString("F" + digits) + "G";
- case 12:
- case 13:
- case 14:
- return (d / 1e12).ToString("F" + digits) + "T";
- case 15:
- case 16:
- case 17:
- return (d / 1e15).ToString("F" + digits) + "P";
- case 18:
- case 19:
- case 20:
- return (d / 1e18).ToString("F" + digits) + "E";
- case 21:
- case 22:
- case 23:
- return (d / 1e21).ToString("F" + digits) + "Z";
- default:
- return (d / 1e24).ToString("F" + digits) + "Y";
+ case 0:
+ case 1:
+ case 2:
+ return d.ToString("F" + digits);
+ case 3:
+ case 4:
+ case 5:
+ return (d / 1e3).ToString("F" + digits) + "k";
+ case 6:
+ case 7:
+ case 8:
+ return (d / 1e6).ToString("F" + digits) + "M";
+ case 9:
+ case 10:
+ case 11:
+ return (d / 1e9).ToString("F" + digits) + "G";
+ case 12:
+ case 13:
+ case 14:
+ return (d / 1e12).ToString("F" + digits) + "T";
+ case 15:
+ case 16:
+ case 17:
+ return (d / 1e15).ToString("F" + digits) + "P";
+ case 18:
+ case 19:
+ case 20:
+ return (d / 1e18).ToString("F" + digits) + "E";
+ case 21:
+ case 22:
+ case 23:
+ return (d / 1e21).ToString("F" + digits) + "Z";
+ default:
+ return (d / 1e24).ToString("F" + digits) + "Y";
}
}
else if (exponent < 0)
{
switch ((int)Math.Floor(exponent))
{
- case -1:
- case -2:
- case -3:
- return (d * 1e3).ToString("F" + digits) + "m";
- case -4:
- case -5:
- case -6:
- return (d * 1e6).ToString("F" + digits) + "μ";
- case -7:
- case -8:
- case -9:
- return (d * 1e9).ToString("F" + digits) + "n";
- case -10:
- case -11:
- case -12:
- return (d * 1e12).ToString("F" + digits) + "p";
- case -13:
- case -14:
- case -15:
- return (d * 1e15).ToString("F" + digits) + "f";
- case -16:
- case -17:
- case -18:
- return (d * 1e18).ToString("F" + digits) + "a";
- case -19:
- case -20:
- case -21:
- return (d * 1e21).ToString("F" + digits) + "z";
- default:
- return (d * 1e24).ToString("F" + digits) + "y";
+ case -1:
+ case -2:
+ case -3:
+ return (d * 1e3).ToString("F" + digits) + "m";
+ case -4:
+ case -5:
+ case -6:
+ return (d * 1e6).ToString("F" + digits) + "μ";
+ case -7:
+ case -8:
+ case -9:
+ return (d * 1e9).ToString("F" + digits) + "n";
+ case -10:
+ case -11:
+ case -12:
+ return (d * 1e12).ToString("F" + digits) + "p";
+ case -13:
+ case -14:
+ case -15:
+ return (d * 1e15).ToString("F" + digits) + "f";
+ case -16:
+ case -17:
+ case -18:
+ return (d * 1e18).ToString("F" + digits) + "a";
+ case -19:
+ case -20:
+ case -21:
+ return (d * 1e21).ToString("F" + digits) + "z";
+ default:
+ return (d * 1e24).ToString("F" + digits) + "y";
}
}
else
@@ -371,9 +375,7 @@
a[0] = char.ToUpper(a[0]);
return new string(a);
}
-
//transfer angles
-
public static double Nivvy_CalcTransferPhaseAngle(double r_current, double r_target, double grav_param)
{
double T_target = (2 * Math.PI) * Math.Sqrt(Math.Pow((r_target / 1000), 3) / (grav_param / 1000000000));
@@ -447,25 +449,42 @@
// returns the ejection angle
}
- public static double Adammada_CurrrentPhaseAngle(double body_LAN, double body_orbitPct, double origin_LAN, double origin_orbitPct)
+ public static double Adammada_CurrrentPhaseAngle(
+ double body_LAN,
+ double body_orbitPct,
+ double origin_LAN,
+ double origin_orbitPct
+ )
{
double angle = (body_LAN / 360 + body_orbitPct) - (origin_LAN / 360 + origin_orbitPct);
- if (angle > 1) angle = angle - 1;
- if (angle < 0) angle = angle + 1;
- if (angle > 0.5) angle = angle - 1;
+ if (angle > 1)
+ angle = angle - 1;
+ if (angle < 0)
+ angle = angle + 1;
+ if (angle > 0.5)
+ angle = angle - 1;
angle = angle * 360;
return angle;
}
- public static double Adammada_CurrentEjectionAngle(double vessel_long, double origin_rotAngle, double origin_LAN, double origin_orbitPct)
+ public static double Adammada_CurrentEjectionAngle(
+ double vessel_long,
+ double origin_rotAngle,
+ double origin_LAN,
+ double origin_orbitPct
+ )
{
//double eangle = ((FlightGlobals.ActiveVOID.vessel.longitude + orbiting.rotationAngle) - (orbiting.orbit.LAN / 360 + orbiting.orbit.orbitPercent) * 360);
double eangle = ((vessel_long + origin_rotAngle) - (origin_LAN / 360 + origin_orbitPct) * 360);
- while (eangle < 0) eangle = eangle + 360;
- while (eangle > 360) eangle = eangle - 360;
- if (eangle < 270) eangle = 90 - eangle;
- else eangle = 450 - eangle;
+ while (eangle < 0)
+ eangle = eangle + 360;
+ while (eangle > 360)
+ eangle = eangle - 360;
+ if (eangle < 270)
+ eangle = 90 - eangle;
+ else
+ eangle = 450 - eangle;
return eangle;
}
@@ -492,7 +511,8 @@
double phase = Vector3d.Angle(vecthis, vectarget);
- if (Vector3d.Angle(prograde, vectarget) > 90) phase = 360 - phase;
+ if (Vector3d.Angle(prograde, vectarget) > 90)
+ phase = 360 - phase;
return (phase + 360) % 360;
}
@@ -500,7 +520,8 @@
public static double FixAngleDomain(double Angle, bool Degrees = false)
{
double Extent = 2d * Math.PI;
- if (Degrees) {
+ if (Degrees)
+ {
Extent = 360d;
}
@@ -515,20 +536,24 @@
public static double FixDegreeDomain(double Angle)
{
- return FixAngleDomain (Angle, true);
+ return FixAngleDomain(Angle, true);
}
public static double adjustCurrPhaseAngle(double transfer_angle, double curr_phase)
{
if (transfer_angle < 0)
{
- if (curr_phase > 0) return (-1 * (360 - curr_phase));
- else if (curr_phase < 0) return curr_phase;
+ if (curr_phase > 0)
+ return (-1 * (360 - curr_phase));
+ else if (curr_phase < 0)
+ return curr_phase;
}
else if (transfer_angle > 0)
{
- if (curr_phase > 0) return curr_phase;
- else if (curr_phase < 0) return (360 + curr_phase);
+ if (curr_phase > 0)
+ return curr_phase;
+ else if (curr_phase < 0)
+ return (360 + curr_phase);
}
return curr_phase;
}
@@ -546,8 +571,10 @@
// if < 0, add curr to 360 // 360 + (-17) = 343
// else its good as it is
- if (curr_ejection < 0) return 360 + curr_ejection;
- else return curr_ejection;
+ if (curr_ejection < 0)
+ return 360 + curr_ejection;
+ else
+ return curr_ejection;
}
@@ -557,8 +584,10 @@
//180 + curr_ejection
// else if transfer_phase_angle > 0 its good as it is
- if (trans_phase < 0) return 180 + trans_ejection;
- else return trans_ejection;
+ if (trans_phase < 0)
+ return 180 + trans_ejection;
+ else
+ return trans_ejection;
}
@@ -568,7 +597,7 @@
// HACK: This assumes that on worlds with oceans, all water is fixed at 0 m,
// and water covers the whole surface at 0 m.
- if (vessel.terrainAltitude < 0 && vessel.mainBody.ocean )
+ if (vessel.terrainAltitude < 0 && vessel.mainBody.ocean)
{
trueAltitude = vessel.orbit.altitude;
}
@@ -578,50 +607,107 @@
public static string get_heading_text(double heading)
{
- if (heading > 348.75 || heading <= 11.25) return "N";
- else if (heading > 11.25 && heading <= 33.75) return "NNE";
- else if (heading > 33.75 && heading <= 56.25) return "NE";
- else if (heading > 56.25 && heading <= 78.75) return "ENE";
- else if (heading > 78.75 && heading <= 101.25) return "E";
- else if (heading > 101.25 && heading <= 123.75) return "ESE";
- else if (heading > 123.75 && heading <= 146.25) return "SE";
- else if (heading > 146.25 && heading <= 168.75) return "SSE";
- else if (heading > 168.75 && heading <= 191.25) return "S";
- else if (heading > 191.25 && heading <= 213.75) return "SSW";
- else if (heading > 213.75 && heading <= 236.25) return "SW";
- else if (heading > 236.25 && heading <= 258.75) return "WSW";
- else if (heading > 258.75 && heading <= 281.25) return "W";
- else if (heading > 281.25 && heading <= 303.75) return "WNW";
- else if (heading > 303.75 && heading <= 326.25) return "NW";
- else if (heading > 326.25 && heading <= 348.75) return "NNW";
- else return "";
- }
-
-
+ if (heading > 348.75 || heading <= 11.25)
+ return "N";
+ else if (heading > 11.25 && heading <= 33.75)
+ return "NNE";
+ else if (heading > 33.75 && heading <= 56.25)
+ return "NE";
+ else if (heading > 56.25 && heading <= 78.75)
+ return "ENE";
+ else if (heading > 78.75 && heading <= 101.25)
+ return "E";
+ else if (heading > 101.25 && heading <= 123.75)
+ return "ESE";
+ else if (heading > 123.75 && heading <= 146.25)
+ return "SE";
+ else if (heading > 146.25 && heading <= 168.75)
+ return "SSE";
+ else if (heading > 168.75 && heading <= 191.25)
+ return "S";
+ else if (heading > 191.25 && heading <= 213.75)
+ return "SSW";
+ else if (heading > 213.75 && heading <= 236.25)
+ return "SW";
+ else if (heading > 236.25 && heading <= 258.75)
+ return "WSW";
+ else if (heading > 258.75 && heading <= 281.25)
+ return "W";
+ else if (heading > 281.25 && heading <= 303.75)
+ return "WNW";
+ else if (heading > 303.75 && heading <= 326.25)
+ return "NW";
+ else if (heading > 326.25 && heading <= 348.75)
+ return "NNW";
+ else
+ return "";
+ }
public static void display_transfer_angles_SUN2PLANET(CelestialBody body, Vessel vessel)
{
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Phase angle (curr/trans):");
- GUILayout.Label(Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + Tools.Nivvy_CalcTransferPhaseAngle(vessel.orbit.semiMajorAxis, body.orbit.semiMajorAxis, vessel.mainBody.gravParameter).ToString("F3") + "°", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + Tools.Nivvy_CalcTransferPhaseAngle(
+ vessel.orbit.semiMajorAxis,
+ body.orbit.semiMajorAxis,
+ vessel.mainBody.gravParameter
+ ).ToString("F3") + "°",
+ GUILayout.ExpandWidth(false)
+ );
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Transfer velocity:");
- GUILayout.Label((Tools.Younata_DeltaVToGetToOtherBody((vessel.mainBody.gravParameter / 1000000000), (vessel.orbit.semiMajorAxis / 1000), (body.orbit.semiMajorAxis / 1000)) * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ (Tools.Younata_DeltaVToGetToOtherBody(
+ (vessel.mainBody.gravParameter / 1000000000),
+ (vessel.orbit.semiMajorAxis / 1000),
+ (body.orbit.semiMajorAxis / 1000)
+ ) * 1000).ToString("F2") + "m/s",
+ GUILayout.ExpandWidth(false)
+ );
GUILayout.EndHorizontal();
}
public static void display_transfer_angles_PLANET2PLANET(CelestialBody body, Vessel vessel)
{
- double dv1 = Tools.Younata_DeltaVToGetToOtherBody((vessel.mainBody.referenceBody.gravParameter / 1000000000), (vessel.mainBody.orbit.semiMajorAxis / 1000), (body.orbit.semiMajorAxis / 1000));
- double dv2 = Tools.Younata_DeltaVToExitSOI((vessel.mainBody.gravParameter / 1000000000), (vessel.orbit.semiMajorAxis / 1000), (vessel.mainBody.sphereOfInfluence / 1000), Math.Abs(dv1));
-
- double trans_ejection_angle = Tools.Younata_TransferBurnPoint((vessel.orbit.semiMajorAxis / 1000), dv2, (Math.PI / 2.0), (vessel.mainBody.gravParameter / 1000000000));
- double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(FlightGlobals.ActiveVessel.longitude, FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent);
-
- double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(vessel.mainBody.orbit.semiMajorAxis, body.orbit.semiMajorAxis, vessel.mainBody.referenceBody.gravParameter) % 360;
- double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(body.orbit.LAN, body.orbit.orbitPercent, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent);
+ double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+ (vessel.mainBody.referenceBody.gravParameter / 1000000000),
+ (vessel.mainBody.orbit.semiMajorAxis / 1000),
+ (body.orbit.semiMajorAxis / 1000)
+ );
+ double dv2 = Tools.Younata_DeltaVToExitSOI(
+ (vessel.mainBody.gravParameter / 1000000000),
+ (vessel.orbit.semiMajorAxis / 1000),
+ (vessel.mainBody.sphereOfInfluence / 1000),
+ Math.Abs(dv1)
+ );
+
+ double trans_ejection_angle = Tools.Younata_TransferBurnPoint(
+ (vessel.orbit.semiMajorAxis / 1000),
+ dv2,
+ (Math.PI / 2.0),
+ (vessel.mainBody.gravParameter / 1000000000)
+ );
+ double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(
+ FlightGlobals.ActiveVessel.longitude,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+ );
+
+ double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+ vessel.mainBody.orbit.semiMajorAxis,
+ body.orbit.semiMajorAxis,
+ vessel.mainBody.referenceBody.gravParameter
+ ) % 360;
+ double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(
+ body.orbit.LAN,
+ body.orbit.orbitPercent,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+ );
double adj_phase_angle = Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
double adj_trans_ejection_angle = Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
@@ -629,12 +715,18 @@
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Phase angle (curr/trans):");
- GUILayout.Label(adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+ GUILayout.ExpandWidth(false)
+ );
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Ejection angle (curr/trans):");
- GUILayout.Label(adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°",
+ GUILayout.ExpandWidth(false)
+ );
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -645,13 +737,24 @@
public static void display_transfer_angles_PLANET2MOON(CelestialBody body, Vessel vessel)
{
- double dv1 = Tools.Younata_DeltaVToGetToOtherBody((vessel.mainBody.gravParameter / 1000000000), (vessel.orbit.semiMajorAxis / 1000), (body.orbit.semiMajorAxis / 1000));
-
- double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(vessel.orbit.semiMajorAxis, body.orbit.semiMajorAxis, vessel.mainBody.gravParameter);
+ double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+ (vessel.mainBody.gravParameter / 1000000000),
+ (vessel.orbit.semiMajorAxis / 1000),
+ (body.orbit.semiMajorAxis / 1000)
+ );
+
+ double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+ vessel.orbit.semiMajorAxis,
+ body.orbit.semiMajorAxis,
+ vessel.mainBody.gravParameter
+ );
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Phase angle (curr/trans):");
- GUILayout.Label(Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+ GUILayout.ExpandWidth(false)
+ );
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -662,14 +765,42 @@
public static void display_transfer_angles_MOON2MOON(CelestialBody body, Vessel vessel)
{
- double dv1 = Tools.Younata_DeltaVToGetToOtherBody((vessel.mainBody.referenceBody.gravParameter / 1000000000), (vessel.mainBody.orbit.semiMajorAxis / 1000), (body.orbit.semiMajorAxis / 1000));
- double dv2 = Tools.Younata_DeltaVToExitSOI((vessel.mainBody.gravParameter / 1000000000), (vessel.orbit.semiMajorAxis / 1000), (vessel.mainBody.sphereOfInfluence / 1000), Math.Abs(dv1));
- double trans_ejection_angle = Tools.Younata_TransferBurnPoint((vessel.orbit.semiMajorAxis / 1000), dv2, (Math.PI / 2.0), (vessel.mainBody.gravParameter / 1000000000));
-
- double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(body.orbit.LAN, body.orbit.orbitPercent, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent);
- double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(FlightGlobals.ActiveVessel.longitude, FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent);
-
- double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(vessel.mainBody.orbit.semiMajorAxis, body.orbit.semiMajorAxis, vessel.mainBody.referenceBody.gravParameter) % 360;
+ double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+ (vessel.mainBody.referenceBody.gravParameter / 1000000000),
+ (vessel.mainBody.orbit.semiMajorAxis / 1000),
+ (body.orbit.semiMajorAxis / 1000)
+ );
+ double dv2 = Tools.Younata_DeltaVToExitSOI(
+ (vessel.mainBody.gravParameter / 1000000000),
+ (vessel.orbit.semiMajorAxis / 1000),
+ (vessel.mainBody.sphereOfInfluence / 1000),
+ Math.Abs(dv1)
+ );
+ double trans_ejection_angle = Tools.Younata_TransferBurnPoint(
+ (vessel.orbit.semiMajorAxis / 1000),
+ dv2,
+ (Math.PI / 2.0),
+ (vessel.mainBody.gravParameter / 1000000000)
+ );
+
+ double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(
+ body.orbit.LAN,
+ body.orbit.orbitPercent,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+ );
+ double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(
+ FlightGlobals.ActiveVessel.longitude,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+ );
+
+ double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+ vessel.mainBody.orbit.semiMajorAxis,
+ body.orbit.semiMajorAxis,
+ vessel.mainBody.referenceBody.gravParameter
+ ) % 360;
double adj_phase_angle = Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
//double adj_ejection_angle = adjustCurrEjectionAngle(trans_phase_angle, curr_ejection_angle);
@@ -683,12 +814,18 @@
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Phase angle (curr/trans):");
- GUILayout.Label(adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+ GUILayout.ExpandWidth(false)
+ );
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Ejection angle (curr/trans):");
- GUILayout.Label(adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°",
+ GUILayout.ExpandWidth(false)
+ );
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -696,12 +833,11 @@
GUILayout.Label((dv2 * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
GUILayout.EndHorizontal();
}
-
// This implementation is adapted from FARGUIUtils.ClampToScreen
public static Rect ClampRectToScreen(Rect window, int xMargin, int yMargin)
{
- window.x = Mathf.Clamp (window.x, xMargin - window.width, Screen.width - xMargin);
- window.y = Mathf.Clamp (window.y, yMargin - window.height, Screen.height - yMargin);
+ window.x = Mathf.Clamp(window.x, xMargin - window.width, Screen.width - xMargin);
+ window.y = Mathf.Clamp(window.y, yMargin - window.height, Screen.height - yMargin);
return window;
}
@@ -713,13 +849,13 @@
public static Rect ClampRectToScreen(Rect window)
{
- return ClampRectToScreen (window, 30);
+ return ClampRectToScreen(window, 30);
}
public static Vector2 ClampV2ToScreen(Vector2 vec, uint xMargin, uint yMargin)
{
- vec.x = Mathf.Clamp (vec.x, xMargin, Screen.width - xMargin);
- vec.y = Mathf.Clamp (vec.y, yMargin, Screen.height - yMargin);
+ vec.x = Mathf.Clamp(vec.x, xMargin, Screen.width - xMargin);
+ vec.y = Mathf.Clamp(vec.y, yMargin, Screen.height - yMargin);
return vec;
}
@@ -731,24 +867,21 @@
public static Vector2 ClampV2ToScreen(Vector2 vec)
{
- return ClampV2ToScreen (vec, 15);
- }
-
+ return ClampV2ToScreen(vec, 15);
+ }
// UNDONE: This seems messy. Can we clean it up?
public static Rect DockToWindow(Rect icon, Rect window)
{
// We can't set the x and y of the center point directly, so build a new vector.
- Vector2 center = new Vector2 ();
+ Vector2 center = new Vector2();
// If we are near the top or bottom of the screen...
if (window.yMax > Screen.height - icon.height ||
- window.yMin < icon.height
- )
+ window.yMin < icon.height)
{
// If we are in a corner...
if (window.xMax > Screen.width - icon.width ||
- window.xMin < icon.width
- )
+ window.xMin < icon.width)
{
// If it is a top corner, put the icon below the window.
if (window.yMax < Screen.height / 2)
@@ -797,8 +930,7 @@
// If we are along a side...
if (window.xMax > Screen.width - icon.width ||
- window.xMin < icon.width
- )
+ window.xMin < icon.width)
{
// UNDONE: I'm not sure I like the feel of this part.
// If we are along a side towards the bottom, put the icon below the window
@@ -827,6 +959,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
@@ -33,15 +33,17 @@
* Static Members
* */
protected static bool _initialized = false;
+
public static bool Initialized
{
- get
- {
- return _initialized;
+ get
+ {
+ return _initialized;
}
}
protected static VOID_Core _instance;
+
public static VOID_Core Instance
{
get
@@ -63,103 +65,79 @@
}
public static double Constant_G = 6.674e-11;
-
/*
* Fields
* */
protected string VoidName = "VOID";
- protected string VoidVersion = "0.9.16";
-
+ protected string VoidVersion = "0.9.19";
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 - 30, 30f, 30f);
- protected Texture2D VOIDIconOff = new Texture2D(30, 30, TextureFormat.ARGB32, false);
- protected Texture2D VOIDIconOn = new Texture2D(30, 30, TextureFormat.ARGB32, false);
+ 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 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 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;
protected Dictionary<string, GUISkin> skin_list;
protected List<string> skinNames;
protected string[] forbiddenSkins =
- {
- "PlaqueDialogSkin",
- "FlagBrowserSkin",
- "SSUITextAreaDefault",
- "ExperimentsDialogSkin",
- "ExpRecoveryDialogSkin",
- "KSP window 5",
- "KSP window 6"
- };
+ {
+ "PlaqueDialogSkin",
+ "FlagBrowserSkin",
+ "SSUITextAreaDefault",
+ "ExperimentsDialogSkin",
+ "ExpRecoveryDialogSkin",
+ "KSP window 5",
+ "KSP window 6",
+ "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
* */
@@ -197,7 +175,7 @@
{
if (this._windowID == 0)
{
- this._windowID = this.windowBaseID;
+ this._windowID = this.windowBaseID;
}
return this._windowID++;
}
@@ -264,7 +242,6 @@
_UseToolbarManager.value = value;
}
}
-
/*
* Methods
* */
@@ -274,45 +251,45 @@
this._Active.value = true;
- this.VOIDIconOn = GameDatabase.Instance.GetTexture (this.VOIDIconOnPath, false);
- this.VOIDIconOff = GameDatabase.Instance.GetTexture (this.VOIDIconOffPath, false);
+ this.VOIDIconOn = GameDatabase.Instance.GetTexture(this.VOIDIconOnPath, false);
+ this.VOIDIconOff = GameDatabase.Instance.GetTexture(this.VOIDIconOffPath, false);
this._skinName = this.defaultSkin;
this.UseToolbarManager = false;
-
- this.LoadConfig ();
- }
-
+ this.ToolbarManagerLoaded = false;
+
+ this.LoadConfig();
+ }
+
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 (
+ .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 ()
+ 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
));
- 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);
}
@@ -323,43 +300,43 @@
"{0}: Loaded {1} modules.",
this.GetType().Name,
this.Modules.Count
- ));
+ ));
}
protected void LoadModule(Type T)
{
- var existingModules = this._modules.Where (mod => mod.GetType ().Name == T.Name);
+ var existingModules = this._modules.Where(mod => mod.GetType().Name == T.Name);
if (existingModules.Any())
{
Tools.PostDebugMessage(string.Format(
"{0}: refusing to load {1}: already loaded",
this.GetType().Name,
T.Name
- ));
+ ));
return;
}
- IVOID_Module module = Activator.CreateInstance (T) as IVOID_Module;
+ IVOID_Module module = Activator.CreateInstance(T) as IVOID_Module;
module.LoadConfig();
- this._modules.Add (module);
+ this._modules.Add(module);
Tools.PostDebugMessage(string.Format(
"{0}: loaded module {1}.",
this.GetType().Name,
T.Name
- ));
+ ));
}
protected void LoadSkins()
{
- Tools.PostDebugMessage ("AssetBase has skins: \n" +
- string.Join("\n\t", AssetBase.FindObjectsOfTypeIncludingAssets (
- typeof(GUISkin))
+ Tools.PostDebugMessage("AssetBase has skins: \n" +
+ string.Join("\n\t",
+ Resources.FindObjectsOfTypeAll(typeof(GUISkin))
.Select(s => s.ToString())
.ToArray()
- )
- );
-
- this.skin_list = AssetBase.FindObjectsOfTypeIncludingAssets(typeof(GUISkin))
+ )
+ );
+
+ this.skin_list = Resources.FindObjectsOfTypeAll(typeof(GUISkin))
.Where(s => !this.forbiddenSkins.Contains(s.name))
.Select(s => s as GUISkin)
.GroupBy(s => s.name)
@@ -370,7 +347,7 @@
"{0}: loaded {1} GUISkins.",
this.GetType().Name,
this.skin_list.Count
- ));
+ ));
this.skinNames = this.skin_list.Keys.ToList();
this.skinNames.Sort();
@@ -381,14 +358,14 @@
Tools.PostDebugMessage(string.Format(
"{0}: resetting _skinIdx to default.",
this.GetType().Name
- ));
+ ));
}
Tools.PostDebugMessage(string.Format(
"{0}: _skinIdx = {1}.",
this.GetType().Name,
this._skinName.ToString()
- ));
+ ));
this.skinsLoaded = true;
}
@@ -411,9 +388,16 @@
this.LabelStyles["right"].normal.textColor = Color.white;
this.LabelStyles["right"].alignment = TextAnchor.UpperRight;
- this.LabelStyles ["red"] = new GUIStyle(GUI.skin.label);
- this.LabelStyles ["red"].normal.textColor = Color.red;
- this.LabelStyles ["red"].alignment = TextAnchor.MiddleCenter;
+ this.LabelStyles["red"] = new GUIStyle(GUI.skin.label);
+ this.LabelStyles["red"].normal.textColor = Color.red;
+ this.LabelStyles["red"].alignment = TextAnchor.MiddleCenter;
+
+ 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;
}
@@ -445,31 +429,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.VOIDIconOffPath;
if (this is VOID_EditorCore)
{
this.ToolbarButton.SetButtonVisibility(new GameScenes[] { GameScenes.EDITOR });
@@ -492,24 +464,26 @@
if (!HighLogic.LoadedSceneIsEditor)
{
string str = "ON";
- if (togglePower) str = "OFF";
- if (GUILayout.Button("Power " + str)) togglePower.value = !togglePower;
+ if (togglePower)
+ str = "OFF";
+ if (GUILayout.Button("Power " + str))
+ togglePower.value = !togglePower;
}
if (togglePower || HighLogic.LoadedSceneIsEditor)
- {
+ {
foreach (IVOID_Module module in this.Modules)
{
- module.toggleActive = GUILayout.Toggle (module.toggleActive, module.Name);
+ module.toggleActive = GUILayout.Toggle(module.toggleActive, module.Name);
}
- }
+ }
}
else
{
- GUILayout.Label("-- POWER LOST --", this.LabelStyles["red"]);
- }
-
- this.configWindowMinimized.value = !GUILayout.Toggle (!this.configWindowMinimized, "Configuration");
+ GUILayout.Label("-- POWER LOST --", this.LabelStyles["red"]);
+ }
+
+ this.configWindowMinimized.value = !GUILayout.Toggle(!this.configWindowMinimized, "Configuration");
GUILayout.EndVertical();
GUI.DragWindow();
@@ -517,12 +491,12 @@
public void VOIDConfigWindow(int _)
{
- GUILayout.BeginVertical ();
-
- this.DrawConfigurables ();
-
- GUILayout.EndVertical ();
- GUI.DragWindow ();
+ GUILayout.BeginVertical();
+
+ this.DrawConfigurables();
+
+ GUILayout.EndVertical();
+ GUI.DragWindow();
}
public override void DrawConfigurables()
@@ -533,9 +507,9 @@
if (HighLogic.LoadedSceneIsFlight)
{
- this.consumeResource.value = GUILayout.Toggle (this.consumeResource, "Consume Resources");
-
- this.VOIDIconLocked = GUILayout.Toggle (this.VOIDIconLocked, "Lock Icon Position");
+ this.consumeResource.value = GUILayout.Toggle(this.consumeResource, "Consume Resources");
+
+ this.VOIDIconLocked = GUILayout.Toggle(this.VOIDIconLocked, "Lock Icon Position");
}
this.UseToolbarManager = GUILayout.Toggle(this.UseToolbarManager, "Use Blizzy's Toolbar If Available");
@@ -563,9 +537,11 @@
_content.tooltip = "Select previous skin";
if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
{
+ this.GUIStylesLoaded = false;
skinIdx--;
- if (skinIdx < 0) skinIdx = skinNames.Count - 1;
- Tools.PostDebugMessage (string.Format (
+ if (skinIdx < 0)
+ skinIdx = skinNames.Count - 1;
+ Tools.PostDebugMessage(string.Format(
"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
this.GetType().Name,
this._skinName,
@@ -581,14 +557,16 @@
_content.tooltip = "Select next skin";
if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
{
+ this.GUIStylesLoaded = false;
skinIdx++;
- if (skinIdx >= skinNames.Count) skinIdx = 0;
- Tools.PostDebugMessage (string.Format (
+ if (skinIdx >= skinNames.Count)
+ skinIdx = 0;
+ Tools.PostDebugMessage(string.Format(
"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
this.GetType().Name,
this._skinName,
this.skin_list.Count
- ));
+ ));
}
if (this._skinName != skinNames[skinIdx])
@@ -616,10 +594,10 @@
foreach (IVOID_Module mod in this.Modules)
{
- mod.DrawConfigurables ();
- }
-
- this._factoryReset = GUILayout.Toggle (this._factoryReset, "Factory Reset");
+ mod.DrawConfigurables();
+ }
+
+ this._factoryReset = GUILayout.Toggle(this._factoryReset, "Factory Reset");
}
public override void DrawGUI()
@@ -628,7 +606,7 @@
if (!this._modulesLoaded)
{
- this.LoadModulesOfType<IVOID_Module> ();
+ this.LoadModulesOfType<IVOID_Module>();
}
if (this.UseToolbarManager && !this.ToolbarManagerLoaded)
@@ -645,15 +623,15 @@
if (!this.GUIStylesLoaded)
{
- this.LoadGUIStyles ();
+ this.LoadGUIStyles();
}
if (this.UseToolbarManager && this.ToolbarManagerLoaded)
{
- this.ToolbarButton.TexturePath = VOIDIconOffPath + "_24x24";
+ this.ToolbarButton.TexturePath = VOIDIconOffPath;
if (this.togglePower)
{
- this.ToolbarButton.TexturePath = VOIDIconOnPath + "_24x24";
+ this.ToolbarButton.TexturePath = VOIDIconOnPath;
}
}
else
@@ -661,7 +639,8 @@
this.VOIDIconTexture = this.VOIDIconOff; //icon off default
if (this.togglePower)
this.VOIDIconTexture = this.VOIDIconOn; //or on if power_toggle==true
- if (GUI.Button(VOIDIconPos, VOIDIconTexture, new GUIStyle()) && this.VOIDIconLocked)
+
+ if (GUI.Button(VOIDIconPos, VOIDIconTexture, this.iconStyle) && this.VOIDIconLocked)
{
this.mainGuiMinimized.value = !this.mainGuiMinimized;
}
@@ -671,16 +650,16 @@
{
Rect _mainWindowPos = this.mainWindowPos;
- _mainWindowPos = GUILayout.Window (
+ _mainWindowPos = GUILayout.Window(
this.windowID,
_mainWindowPos,
this.VOIDMainWindow,
- string.Join (" ", new string[] {this.VoidName, this.VoidVersion}),
- GUILayout.Width (250),
- GUILayout.Height (50)
- );
-
- _mainWindowPos = Tools.ClampRectToScreen (_mainWindowPos);
+ string.Join(" ", new string[] { this.VoidName, this.VoidVersion }),
+ GUILayout.Width(250),
+ GUILayout.Height(50)
+ );
+
+ _mainWindowPos = Tools.ClampRectToScreen(_mainWindowPos);
if (_mainWindowPos != this.mainWindowPos)
{
@@ -692,16 +671,16 @@
{
Rect _configWindowPos = this.configWindowPos;
- _configWindowPos = GUILayout.Window (
+ _configWindowPos = GUILayout.Window(
this.windowID,
_configWindowPos,
this.VOIDConfigWindow,
- string.Join (" ", new string[] {this.VoidName, "Configuration"}),
- GUILayout.Width (250),
- GUILayout.Height (50)
- );
-
- _configWindowPos = Tools.ClampRectToScreen (_configWindowPos);
+ string.Join(" ", new string[] { this.VoidName, "Configuration" }),
+ GUILayout.Width(250),
+ GUILayout.Height(50)
+ );
+
+ _configWindowPos = Tools.ClampRectToScreen(_configWindowPos);
if (_configWindowPos != this.configWindowPos)
{
@@ -735,8 +714,7 @@
if (!this.VOIDIconLocked &&
VOIDIconPos.value.Contains(Event.current.mousePosition)
- && Event.current.type == EventType.mouseDrag
- )
+ && Event.current.type == EventType.mouseDrag)
{
Tools.PostDebugMessage(string.Format(
"Event.current.type: {0}" +
@@ -767,36 +745,35 @@
public void Update()
{
- this.LoadBeforeUpdate ();
+ this.LoadBeforeUpdate();
if (this.vessel != null)
{
SimManager.Instance.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
- Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
+ Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
SimManager.Instance.TryStartSimulation();
}
if (!this.guiRunning)
{
- this.StartGUI ();
+ this.StartGUI();
}
if (!HighLogic.LoadedSceneIsFlight && this.guiRunning)
{
- this.StopGUI ();
+ this.StopGUI();
}
foreach (IVOID_Module module in this.Modules)
{
if (!module.guiRunning && module.toggleActive)
{
- module.StartGUI ();
+ module.StartGUI();
}
if (module.guiRunning && !module.toggleActive ||
!this.togglePower ||
!HighLogic.LoadedSceneIsFlight ||
- this.factoryReset
- )
+ this.factoryReset)
{
module.StopGUI();
}
@@ -807,7 +784,7 @@
}
}
- this.CheckAndSave ();
+ this.CheckAndSave();
this._updateTimer += Time.deltaTime;
}
@@ -815,11 +792,10 @@
{
if (this.consumeResource &&
this.vessel.vesselType != VesselType.EVA &&
- TimeWarp.deltaTime != 0
- )
+ TimeWarp.deltaTime != 0)
{
float powerReceived = this.vessel.rootPart.RequestResource(this.resourceName,
- this.resourceRate * TimeWarp.fixedDeltaTime);
+ this.resourceRate * TimeWarp.fixedDeltaTime);
if (powerReceived > 0)
{
this.powerAvailable = true;
@@ -839,15 +815,15 @@
public void ResetGUI()
{
- this.StopGUI ();
+ this.StopGUI();
foreach (IVOID_Module module in this.Modules)
{
- module.StopGUI ();
- module.StartGUI ();
- }
-
- this.StartGUI ();
+ module.StopGUI();
+ module.StartGUI();
+ }
+
+ this.StartGUI();
}
protected void CheckAndSave()
@@ -861,37 +837,37 @@
return;
}
- Tools.PostDebugMessage (string.Format (
+ Tools.PostDebugMessage(string.Format(
"{0}: Time to save, checking if configDirty: {1}",
- this.GetType ().Name,
+ this.GetType().Name,
this.configDirty
- ));
-
- this.SaveConfig ();
+ ));
+
+ this.SaveConfig();
this.saveTimer = 0;
}
}
public override void LoadConfig()
{
- base.LoadConfig ();
+ base.LoadConfig();
foreach (IVOID_Module module in this.Modules)
{
- module.LoadConfig ();
+ module.LoadConfig();
}
}
public void SaveConfig()
{
- var config = KSP.IO.PluginConfiguration.CreateForType<VOID_Core> ();
- config.load ();
+ var config = KSP.IO.PluginConfiguration.CreateForType<VOID_Core>();
+ config.load();
this._SaveToConfig(config);
foreach (IVOID_Module module in this.Modules)
{
- module._SaveToConfig (config);
+ module._SaveToConfig(config);
}
config.save();
--- 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_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();