VOID_Rendezvous: API fix for KSP 0.23.5.
--- a/ToolbarButtonWrapper.cs
+++ /dev/null
@@ -1,393 +1,1 @@
-//
-// ToolbarWrapper.cs
-//
-// Author:
-// toadicus <>
-//
-// Copyright (c) 2013 toadicus
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-using System;
-using System.Linq;
-using System.Reflection;
-using UnityEngine;
-namespace VOID
-{
- /// <summary>
- /// Wraps a Toolbar clickable button, after fetching it from a foreign assembly.
- /// </summary>
- internal class ToolbarButtonWrapper
- {
- protected System.Type ToolbarManager;
- protected object TBManagerInstance;
- protected MethodInfo TBManagerAdd;
- protected System.Type IButton;
- protected object Button;
- protected PropertyInfo ButtonText;
- protected PropertyInfo ButtonTextColor;
- protected PropertyInfo ButtonTexturePath;
- protected PropertyInfo ButtonToolTip;
- protected PropertyInfo ButtonVisible;
- protected PropertyInfo ButtonVisibility;
- protected PropertyInfo ButtonEnalbed;
- protected PropertyInfo ButtonImportant;
- protected EventInfo ButtonOnClick;
- protected System.Type ClickHandlerType;
- protected MethodInfo ButtonDestroy;
- protected System.Type GameScenesVisibilityType;
-
- /// <summary>
- /// The text displayed on the button. Set to null to hide text.
- /// </summary>
- /// <remarks>
- /// The text can be changed at any time to modify the button's appearance. Note that since this will also
- /// modify the button's size, this feature should be used sparingly, if at all.
- /// </remarks>
- /// <seealso cref="TexturePath"/>
- public string Text
- {
- get
- {
- return this.ButtonText.GetValue(this.Button, null) as String;
- }
- set
- {
- this.ButtonText.SetValue(this.Button, value, null);
- }
- }
-
- /// <summary>
- /// The color the button text is displayed with. Defaults to Color.white.
- /// </summary>
- /// <remarks>
- /// The text color can be changed at any time to modify the button's appearance.
- /// </remarks>
- public Color TextColor
- {
- get
- {
- return (Color)this.ButtonTextColor.GetValue(this.Button, null);
- }
- set
- {
- this.ButtonTextColor.SetValue(this.Button, value, null);
- }
- }
-
- /// <summary>
- /// The path of a texture file to display an icon on the button. Set to null to hide icon.
- /// </summary>
- /// <remarks>
- /// <para>
- /// A texture path on a button will have precedence over text. That is, if both text and texture path
- /// have been set on a button, the button will show the texture, not the text.
- /// </para>
- /// <para>
- /// The texture size must not exceed 24x24 pixels.
- /// </para>
- /// <para>
- /// The texture path must be relative to the "GameData" directory, and must not specify a file name suffix.
- /// Valid example: MyAddon/Textures/icon_mybutton
- /// </para>
- /// <para>
- /// The texture path can be changed at any time to modify the button's appearance.
- /// </para>
- /// </remarks>
- /// <seealso cref="Text"/>
- public string TexturePath
- {
- get
- {
- return this.ButtonTexturePath.GetValue(this.Button, null) as string;
- }
- set
- {
- this.ButtonTexturePath.SetValue(this.Button, value, null);
- }
- }
-
- /// <summary>
- /// The button's tool tip text. Set to null if no tool tip is desired.
- /// </summary>
- /// <remarks>
- /// Tool Tip Text Should Always Use Headline Style Like This.
- /// </remarks>
- public string ToolTip
- {
- get
- {
- return this.ButtonToolTip.GetValue(this.Button, null) as string;
- }
- set
- {
- this.ButtonToolTip.SetValue(this.Button, value, null);
- }
- }
-
- /// <summary>
- /// Whether this button is currently visible or not. Can be used in addition to or as a replacement for <see cref="Visibility"/>.
- /// </summary>
- public bool Visible
- {
- get
- {
- return (bool)this.ButtonVisible.GetValue(this.Button, null);
- }
- set
- {
- this.ButtonVisible.SetValue(this.Button, value, 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>
- public bool Enabled
- {
- get
- {
- return (bool)this.ButtonEnalbed.GetValue(this.Button, null);
- }
- set
- {
- this.ButtonEnalbed.SetValue(this.Button, value, null);
- }
- }
-
- /// <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
- ));
-
- this.IButton = AssemblyLoader.loadedAssemblies
- .Select(a => a.assembly.GetExportedTypes())
- .SelectMany(t => t)
- .FirstOrDefault(t => t.FullName == "Toolbar.IButton");
-
- 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 '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.",
- 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())
- .SelectMany(t => t)
- .FirstOrDefault(t => t.FullName == "Toolbar.GameScenesVisibility");
-
- Tools.PostDebugMessage(string.Format(
- "{0}: Got 'GameScenesVisibility' class '{1}'.",
- this.GetType().Name,
- this.GameScenesVisibilityType.ToString()
- ));
-
- Tools.PostDebugMessage("ToolbarButtonWrapper built!");
- }
-
- /// <summary>
- /// Adds event handler to receive "on click" events.
- /// </summary>
- /// <example>
- /// <code>
- /// ToolbarButtonWrapper button = ...
- /// button.AddButtonClickHandler(
- /// (e) =>
- /// {
- /// Debug.Log("button clicked, mouseButton: " + e.Mousebutton");
- /// }
- /// );
- /// </code>
- /// </example>
- /// <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 });
- }
-
- /// <summary>
- /// Sets this button's visibility. Can be used in addition to or as a replacement for <see cref="Visible"/>.
- /// </summary>
- /// <param name="gameScenes">Array of GameScene objects in which the button should be visible.</param>
- public void SetButtonVisibility(params GameScenes[] gameScenes)
- {
- object GameScenesVisibilityObj = Activator.CreateInstance(this.GameScenesVisibilityType, gameScenes);
- this.ButtonVisibility.SetValue(this.Button, GameScenesVisibilityObj, null);
- }
-
- /// <summary>
- /// Permanently destroys this button so that it is no longer displayed.
- /// Should be used when a plugin is stopped to remove leftover buttons.
- /// </summary>
- public void Destroy()
- {
- this.ButtonDestroy.Invoke(this.Button, null);
- }
- }
-}
-
--- a/Tools.cs
+++ b/Tools.cs
@@ -149,83 +149,60 @@
return string.Format("{0}° {1}", Math.Abs(v_lat).ToString(format), dir_lat);
}
- ///////////////////////////////////////////////////////////////////////////////
-
- //For MuMech_get_heading()
- public class MuMech_MovingAverage
- {
- private double[] store;
- private int storeSize;
- private int nextIndex = 0;
-
- public double value
- {
- get
- {
- double tmp = 0;
- foreach (double i in store)
- {
- tmp += i;
- }
- return tmp / storeSize;
- }
- set
- {
- store[nextIndex] = value;
- nextIndex = (nextIndex + 1) % storeSize;
- }
- }
-
- public MuMech_MovingAverage(int size = 10, double startingValue = 0)
- {
- storeSize = size;
- store = new double[size];
- force(startingValue);
- }
-
- public void force(double newValue)
- {
- for (int i = 0; i < storeSize; i++)
- {
- store[i] = newValue;
- }
- }
-
- public static implicit operator double(MuMech_MovingAverage v)
- {
- return v.value;
- }
-
- public override string ToString()
- {
- return value.ToString();
- }
-
- public string ToString(string format)
- {
- 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;
-
- Quaternion rotationSurface = Quaternion.LookRotation(north, up);
- Quaternion rotationvesselSurface = Quaternion.Inverse(
- 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
+ /*
+ * MuMechLib Methods
+ * The methods below are adapted from MuMechLib, © 2013-2014 r4m0n
+ * The following methods are a derivative work of the code from MuMechLib in the MechJeb project.
+ * Used under license.
+ * */
+
+ // Derived from MechJeb2/VesselState.cs
+ public static Quaternion getSurfaceRotation(this Vessel vessel)
+ {
+ Vector3 CoM;
+
+ try
+ {
+ CoM = vessel.findWorldCenterOfMass();
+ }
+ catch
+ {
+ return new Quaternion();
+ }
+
+ Vector3 bodyPosition = vessel.mainBody.position;
+ Vector3 bodyUp = vessel.mainBody.transform.up;
+
+ Vector3 surfaceUp = (CoM - vessel.mainBody.position).normalized;
+ Vector3 surfaceNorth = Vector3.Exclude(
+ surfaceUp,
+ (bodyPosition + bodyUp * (float)vessel.mainBody.Radius) - CoM
+ ).normalized;
+
+ Quaternion surfaceRotation = Quaternion.LookRotation(surfaceNorth, surfaceUp);
+
+ return Quaternion.Inverse(
+ Quaternion.Euler(90, 0, 0) * Quaternion.Inverse(vessel.GetTransform().rotation) * surfaceRotation
+ );
+ }
+
+ // Derived from MechJeb2/VesselState.cs
+ public static double getSurfaceHeading(this Vessel vessel)
+ {
+ return vessel.getSurfaceRotation().eulerAngles.y;
+ }
+
+ // Derived from MechJeb2/VesselState.cs
+ public static double getSurfacePitch(this Vessel vessel)
+ {
+ Quaternion vesselSurfaceRotation = vessel.getSurfaceRotation();
+
+ return (vesselSurfaceRotation.eulerAngles.x > 180f) ?
+ (360f - vesselSurfaceRotation.eulerAngles.x) :
+ -vesselSurfaceRotation.eulerAngles.x;
+ }
+
+ // Derived from MechJeb2/MuUtils.cs
public static string MuMech_ToSI(
double d, int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue
)
@@ -315,6 +292,10 @@
}
}
+ /*
+ * END MuMecLib METHODS
+ * */
+
public static string ConvertInterval(double seconds)
{
string format_1 = "{0:D1}y {1:D1}d {2:D2}h {3:D2}m {4:D2}.{5:D1}s";
@@ -959,6 +940,83 @@
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 double Radius(this Vessel vessel)
+ {
+ double radius;
+
+ radius = vessel.altitude;
+
+ if (vessel.mainBody != null)
+ {
+ radius += vessel.mainBody.Radius;
+ }
+
+ return radius;
+ }
+
+ public static double TryGetLastMass(this Engineer.VesselSimulator.SimManager simManager)
+ {
+ if (simManager.Stages == null || simManager.Stages.Length <= Staging.lastStage)
+ {
+ return double.NaN;
+ }
+
+ return simManager.Stages[Staging.lastStage].totalMass;
+ }
+
+ 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")]
--- /dev/null
+++ b/VOIDEditorMaster.cs
@@ -1,1 +1,100 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+// VOID - Vessel Orbital Information Display for Kerbal Space Program
+// Copyright (C) 2012 Iannic-ann-od
+// Copyright (C) 2013 Toadicus
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+// Much, much credit to Younata, Adammada, Nivvydaskrl and to all the authors
+// behind MechJeb, RemoteTech Relay Network, ISA MapSat, and Protractor for some
+// invaluable functions and making your nicely written code available to learn from.
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+// This software uses VesselSimulator and Engineer.Extensions from Engineer Redux.
+// Engineer Redux (c) 2013 cybutek
+// Used by permission.
+//
+///////////////////////////////////////////////////////////////////////////////
+using System;
+using UnityEngine;
+using Engineer.VesselSimulator;
+
+namespace VOID
+{
+ [KSPAddon(KSPAddon.Startup.EditorAny, false)]
+ public class VOIDEditorMaster : MonoBehaviour
+ {
+ protected VOID_EditorCore Core;
+
+ public void Awake()
+ {
+ Tools.PostDebugMessage ("VOIDEditorMaster: Waking up.");
+ this.Core = VOID_EditorCore.Instance;
+ this.Core.ResetGUI ();
+ SimManager.HardReset();
+ Tools.PostDebugMessage ("VOIDEditorMaster: Awake.");
+ }
+
+ public void Update()
+ {
+ if (!HighLogic.LoadedSceneIsEditor && this.Core != null)
+ {
+ this.Core.SaveConfig ();
+ this.Core = null;
+ VOID_EditorCore.Reset();
+ return;
+ }
+
+ if (this.Core == null)
+ {
+ this.Awake();
+ }
+
+ this.Core.Update ();
+
+ if (this.Core.factoryReset)
+ {
+ KSP.IO.File.Delete<VOID_EditorCore>("config.xml");
+ this.Core = null;
+ VOID_EditorCore.Reset();
+ }
+ }
+
+ public void FixedUpdate()
+ {
+ if (this.Core == null || !HighLogic.LoadedSceneIsEditor)
+ {
+ return;
+ }
+
+ this.Core.FixedUpdate ();
+ }
+
+ public void OnGUI()
+ {
+ if (this.Core == null)
+ {
+ return;
+ }
+
+ this.Core.OnGUI();
+ }
+ }
+}
+
--- a/VOIDFlightMaster.cs
+++ b/VOIDFlightMaster.cs
@@ -96,65 +96,5 @@
this.Core.OnGUI();
}
}
-
- [KSPAddon(KSPAddon.Startup.EditorAny, false)]
- public class VOIDEditorMaster : MonoBehaviour
- {
- protected VOID_EditorCore Core;
-
- public void Awake()
- {
- Tools.PostDebugMessage ("VOIDEditorMaster: Waking up.");
- this.Core = VOID_EditorCore.Instance;
- this.Core.ResetGUI ();
- SimManager.HardReset();
- Tools.PostDebugMessage ("VOIDEditorMaster: Awake.");
- }
-
- public void Update()
- {
- if (!HighLogic.LoadedSceneIsEditor && this.Core != null)
- {
- this.Core.SaveConfig ();
- this.Core = null;
- VOID_EditorCore.Reset();
- return;
- }
-
- if (this.Core == null)
- {
- this.Awake();
- }
-
- this.Core.Update ();
-
- if (this.Core.factoryReset)
- {
- KSP.IO.File.Delete<VOID_EditorCore>("config.xml");
- this.Core = null;
- VOID_EditorCore.Reset();
- }
- }
-
- public void FixedUpdate()
- {
- if (this.Core == null || !HighLogic.LoadedSceneIsEditor)
- {
- return;
- }
-
- this.Core.FixedUpdate ();
- }
-
- public void OnGUI()
- {
- if (this.Core == null)
- {
- return;
- }
-
- this.Core.OnGUI();
- }
- }
}
--- a/VOID_CBInfoBrowser.cs
+++ b/VOID_CBInfoBrowser.cs
@@ -98,8 +98,6 @@
GUILayout.EndVertical();
GUILayout.EndHorizontal();
-
- //}
//toggle for orbital info chunk
if (GUILayout.Button("Orbital Characteristics", GUILayout.ExpandWidth(true))) toggleOrbital.value = !toggleOrbital;
@@ -206,84 +204,53 @@
private void body_OP_show_orbital_info(CelestialBody body)
{
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label((body.orbit.ApA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label(Tools.ConvertInterval(body.orbit.timeToAp), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label((body.orbit.PeA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label(Tools.ConvertInterval(body.orbit.timeToPe), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label((body.orbit.semiMajorAxis / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label(body.orbit.eccentricity.ToString("F4") + "", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label(Tools.ConvertInterval(body.orbit.period), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label(Tools.ConvertInterval(body.rotationPeriod), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label((body.orbit.orbitalSpeed / 1000).ToString("F2") + "km/s", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
// Toadicus edit: convert mean anomaly into degrees.
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label((body.orbit.meanAnomaly * 180d / Math.PI).ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label(body.orbit.trueAnomaly.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
// Toadicus edit: convert eccentric anomaly into degrees.
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label((body.orbit.eccentricAnomaly * 180d / Math.PI).ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label(body.orbit.inclination.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label(body.orbit.LAN.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label(body.orbit.argumentOfPeriapsis.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else
{
@@ -291,42 +258,28 @@
if (body.tidallyLocked) body_tidally_locked = "Yes";
GUILayout.Label(body_tidally_locked, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
}
- //GUILayout.EndHorizontal();
}
private void body_OP_show_physical_info(CelestialBody body)
{
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
GUILayout.Label((body.Radius / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
GUILayout.Label(((Math.Pow((body.Radius), 2) * 4 * Math.PI) / 1000).ToString("0.00e+00") + "km²", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
// divide by 1000 to convert m to km
GUILayout.Label((((4d / 3) * Math.PI * Math.Pow(body.Radius, 3)) / 1000).ToString("0.00e+00") + "km³", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.Label(((4 / 3) * Math.PI * Math.Pow((vessel.mainBody.Radius / 1000), 3)).ToString(), right, GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
GUILayout.Label(body.Mass.ToString("0.00e+00") + "kg", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
double p = body.Mass / (Math.Pow(body.Radius, 3) * (4d / 3) * Math.PI);
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
GUILayout.Label(p.ToString("##,#") + "kg/m³", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
if (body.bodyName == "Sun") GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
else GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
GUILayout.Label(body.orbitingBodies.Count.ToString(), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
//show # artificial satellites
int num_art_sats = 0;
@@ -335,30 +288,31 @@
if (v.mainBody == body && v.situation.ToString() == "ORBITING") num_art_sats++;
}
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label(num_art_sats.ToString(), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
double g_ASL = (VOID_Core.Constant_G * body.Mass) / Math.Pow(body.Radius, 2);
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
GUILayout.Label(Tools.MuMech_ToSI(g_ASL) + "m/s²", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("≈ " + Tools.MuMech_ToSI(body.maxAtmosphereAltitude) + "m", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- string O2 = "No";
- if (body.atmosphereContainsOxygen == true) O2 = "Yes";
- GUILayout.Label(O2, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+ if (body.atmosphere)
+ {
+ GUILayout.Label("≈ " + Tools.MuMech_ToSI(body.maxAtmosphereAltitude) + "m",
+ VOID_Core.Instance.LabelStyles["right"],
+ GUILayout.ExpandWidth(true));
+
+ string O2 = "No";
+ if (body.atmosphereContainsOxygen == true) O2 = "Yes";
+ GUILayout.Label(O2, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ }
+ else
+ {
+ GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ }
+
string ocean = "No";
if (body.ocean == true) ocean = "Yes";
GUILayout.Label(ocean, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
}
}
}
--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -69,58 +69,78 @@
* Fields
* */
protected string VoidName = "VOID";
- protected string VoidVersion = "0.9.17";
+ protected string VoidVersion = "0.9.22";
+
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_24x24";
- protected string VOIDIconOffPath = "VOID/Textures/void_icon_off_24x24";
+ 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>();
+
+ protected CelestialBody _Kerbin;
+
[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;
- protected Dictionary<string, GUISkin> skin_list;
- protected List<string> skinNames;
+ protected int _skinIdx;
+
+ protected Dictionary<string, GUISkin> validSkins;
+ protected string[] skinNames;
protected string[] forbiddenSkins =
{
"PlaqueDialogSkin",
@@ -133,11 +153,13 @@
"PartTooltipSkin"
};
protected bool skinsLoaded = false;
+
public bool configDirty;
+
[AVOID_SaveValue("UseBlizzyToolbar")]
protected VOID_SaveValue<bool> _UseToolbarManager;
- protected bool ToolbarManagerLoaded = false;
- internal ToolbarButtonWrapper ToolbarButton;
+ internal IButton ToolbarButton;
+
/*
* Properties
* */
@@ -161,11 +183,18 @@
{
get
{
- if (!this.skinsLoaded || this._skinName == null)
- {
- return AssetBase.GetGUISkin(this.defaultSkin);
- }
- return this.skin_list[this._skinName];
+ if (this.skinsLoaded)
+ {
+ try
+ {
+ return this.validSkins[this._skinName];
+ }
+ catch
+ {
+ }
+ }
+
+ return AssetBase.GetGUISkin(this.defaultSkin);
}
}
@@ -193,7 +222,23 @@
{
get
{
- return this._allBodies;
+ return FlightGlobals.Bodies;
+ }
+ }
+
+ public CelestialBody Kerbin
+ {
+ get
+ {
+ if (this._Kerbin == null)
+ {
+ if (FlightGlobals.Bodies != null)
+ {
+ this._Kerbin = FlightGlobals.Bodies.First(b => b.name == "Kerbin");
+ }
+ }
+
+ return this._Kerbin;
}
}
@@ -221,6 +266,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,12 +306,17 @@
}
set
{
- if (value == false && this.ToolbarManagerLoaded && this.ToolbarButton != null)
+ if (this._UseToolbarManager == value)
+ {
+ return;
+ }
+
+ if (value == false && this.ToolbarButton != null)
{
this.ToolbarButton.Destroy();
this.ToolbarButton = null;
}
- if (value == true && this.ToolbarManagerLoaded && this.ToolbarButton == null)
+ if (value == true)
{
this.InitializeToolbarButton();
}
@@ -242,375 +324,10 @@
_UseToolbarManager.value = value;
}
}
+
/*
* Methods
* */
- protected VOID_Core()
- {
- this._Name = "VOID Core";
-
- 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.UseToolbarManager = 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(
- "{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);
- }
-
- this._modulesLoaded = true;
-
- Tools.PostDebugMessage(string.Format(
- "{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);
- 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;
- module.LoadConfig();
- 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",
- Resources.FindObjectsOfTypeAll(typeof(GUISkin))
- .Select(s => s.ToString())
- .ToArray()
- )
- );
-
- this.skin_list = Resources.FindObjectsOfTypeAll(typeof(GUISkin))
- .Where(s => !this.forbiddenSkins.Contains(s.name))
- .Select(s => s as GUISkin)
- .GroupBy(s => s.name)
- .Select(g => g.First())
- .ToDictionary(s => s.name);
-
- Tools.PostDebugMessage(string.Format(
- "{0}: loaded {1} GUISkins.",
- this.GetType().Name,
- this.skin_list.Count
- ));
-
- this.skinNames = this.skin_list.Keys.ToList();
- this.skinNames.Sort();
-
- if (this._skinName == null || !this.skinNames.Contains(this._skinName))
- {
- this._skinName = this.defaultSkin;
- Tools.PostDebugMessage(string.Format(
- "{0}: resetting _skinIdx to default.",
- this.GetType().Name
- ));
- }
-
- Tools.PostDebugMessage(string.Format(
- "{0}: _skinIdx = {1}.",
- this.GetType().Name,
- this._skinName.ToString()
- ));
-
- this.skinsLoaded = true;
- }
-
- protected void LoadGUIStyles()
- {
- this.LabelStyles["link"] = new GUIStyle(GUI.skin.label);
- this.LabelStyles["link"].fontStyle = FontStyle.Bold;
-
- this.LabelStyles["center"] = new GUIStyle(GUI.skin.label);
- this.LabelStyles["center"].normal.textColor = Color.white;
- this.LabelStyles["center"].alignment = TextAnchor.UpperCenter;
-
- this.LabelStyles["center_bold"] = new GUIStyle(GUI.skin.label);
- this.LabelStyles["center_bold"].normal.textColor = Color.white;
- this.LabelStyles["center_bold"].alignment = TextAnchor.UpperCenter;
- this.LabelStyles["center_bold"].fontStyle = FontStyle.Bold;
-
- this.LabelStyles["right"] = new GUIStyle(GUI.skin.label);
- this.LabelStyles["right"].normal.textColor = Color.white;
- this.LabelStyles["right"].alignment = TextAnchor.UpperRight;
-
- this.LabelStyles["red"] = new GUIStyle(GUI.skin.label);
- this.LabelStyles["red"].normal.textColor = Color.red;
- this.LabelStyles["red"].alignment = TextAnchor.MiddleCenter;
-
- this.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;
- }
-
- protected void LoadAllBodies()
- {
- this._allBodies = FlightGlobals.Bodies;
- this.bodiesLoaded = true;
- }
-
- protected void LoadVesselTypes()
- {
- this._allVesselTypes = Enum.GetValues(typeof(VesselType)).OfType<VesselType>().ToList();
- this.vesselTypesLoaded = true;
- }
-
- protected void LoadBeforeUpdate()
- {
- if (!this.bodiesLoaded)
- {
- this.LoadAllBodies();
- }
-
- if (!this.vesselTypesLoaded)
- {
- this.LoadVesselTypes();
- }
- }
-
- 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;
- }
-
- protected void InitializeToolbarButton()
- {
- this.ToolbarButton = new ToolbarButtonWrapper(this.GetType().Name, "coreToggle");
- this.ToolbarButton.Text = this.VoidName;
- this.ToolbarButton.TexturePath = this.VOIDIconOffPath + "_24x24";
- if (this is VOID_EditorCore)
- {
- this.ToolbarButton.SetButtonVisibility(new GameScenes[] { GameScenes.EDITOR });
- }
- else
- {
- this.ToolbarButton.SetButtonVisibility(new GameScenes[] { GameScenes.FLIGHT });
- }
- this.ToolbarButton.AddButtonClickHandler(
- (e) => this.mainGuiMinimized = !this.mainGuiMinimized
- );
- }
-
- public void VOIDMainWindow(int _)
- {
- GUILayout.BeginVertical();
-
- if (this.powerAvailable || HighLogic.LoadedSceneIsEditor)
- {
- if (!HighLogic.LoadedSceneIsEditor)
- {
- string str = "ON";
- 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);
- }
- }
- }
- else
- {
- GUILayout.Label("-- POWER LOST --", this.LabelStyles["red"]);
- }
-
- this.configWindowMinimized.value = !GUILayout.Toggle(!this.configWindowMinimized, "Configuration");
-
- GUILayout.EndVertical();
- GUI.DragWindow();
- }
-
- public void VOIDConfigWindow(int _)
- {
- GUILayout.BeginVertical();
-
- this.DrawConfigurables();
-
- GUILayout.EndVertical();
- GUI.DragWindow();
- }
-
- public override void DrawConfigurables()
- {
- int skinIdx;
-
- GUIContent _content;
-
- if (HighLogic.LoadedSceneIsFlight)
- {
- 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");
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-
- GUILayout.Label("Skin:", GUILayout.ExpandWidth(false));
-
- _content = new GUIContent();
-
- if (skinNames.Contains(this._skinName))
- {
- skinIdx = skinNames.IndexOf(this._skinName);
- }
- else if (skinNames.Contains(this.defaultSkin))
- {
- skinIdx = skinNames.IndexOf(this.defaultSkin);
- }
- else
- {
- skinIdx = 0;
- }
-
- _content.text = "◄";
- _content.tooltip = "Select previous skin";
- if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
- {
- this.GUIStylesLoaded = false;
- skinIdx--;
- if (skinIdx < 0)
- skinIdx = skinNames.Count - 1;
- Tools.PostDebugMessage(string.Format(
- "{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
- this.GetType().Name,
- this._skinName,
- this.skin_list.Count
- ));
- }
-
- _content.text = this.Skin.name;
- _content.tooltip = "Current skin";
- GUILayout.Label(_content, this.LabelStyles["center"], GUILayout.ExpandWidth(true));
-
- _content.text = "►";
- _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(
- "{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
- this.GetType().Name,
- this._skinName,
- this.skin_list.Count
- ));
- }
-
- if (this._skinName != skinNames[skinIdx])
- {
- this._skinName = skinNames[skinIdx];
- }
-
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal();
- GUILayout.Label("Update Rate (Hz):");
- if (this.stringFrequency == null)
- {
- this.stringFrequency = (1f / this.updatePeriod).ToString();
- }
- this.stringFrequency = GUILayout.TextField(this.stringFrequency.ToString(), 5, GUILayout.ExpandWidth(true));
- // GUILayout.FlexibleSpace();
- if (GUILayout.Button("Apply"))
- {
- double updateFreq = 1f / this.updatePeriod;
- double.TryParse(stringFrequency, out updateFreq);
- this._updatePeriod = 1 / updateFreq;
- }
- GUILayout.EndHorizontal();
-
- foreach (IVOID_Module mod in this.Modules)
- {
- mod.DrawConfigurables();
- }
-
- this._factoryReset = GUILayout.Toggle(this._factoryReset, "Factory Reset");
- }
-
public override void DrawGUI()
{
this._windowID = this.windowBaseID;
@@ -620,11 +337,6 @@
this.LoadModulesOfType<IVOID_Module>();
}
- if (this.UseToolbarManager && !this.ToolbarManagerLoaded)
- {
- this.LoadToolbarManager();
- }
-
if (!this.skinsLoaded)
{
this.LoadSkins();
@@ -637,28 +349,21 @@
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)
+ {
if (GUI.Button(VOIDIconPos, VOIDIconTexture, this.iconStyle) && this.VOIDIconLocked)
{
- this.mainGuiMinimized.value = !this.mainGuiMinimized;
- }
+ this.ToggleMainWindow();
+ }
+ }
+ else if (this.ToolbarButton == null)
+ {
+ this.InitializeToolbarButton();
}
if (!this.mainGuiMinimized)
{
+
Rect _mainWindowPos = this.mainWindowPos;
_mainWindowPos = GUILayout.Window(
@@ -761,7 +466,7 @@
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.Radius(), 2);
SimManager.Instance.TryStartSimulation();
}
@@ -801,19 +506,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 +551,363 @@
}
this.StartGUI();
+ }
+
+ public void VOIDMainWindow(int _)
+ {
+ GUILayout.BeginVertical();
+
+ if (this.powerAvailable || HighLogic.LoadedSceneIsEditor)
+ {
+ if (!HighLogic.LoadedSceneIsEditor)
+ {
+ string str = string.Intern("ON");
+ if (togglePower)
+ str = string.Intern("OFF");
+ if (GUILayout.Button("Power " + str))
+ {
+ togglePower.value = !togglePower;
+ this.SetIconTexture(this.powerState | this.activeState);
+ }
+ }
+
+ if (togglePower || HighLogic.LoadedSceneIsEditor)
+ {
+ foreach (IVOID_Module module in this.Modules)
+ {
+ 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.EndVertical();
+ GUI.DragWindow();
+ }
+
+ public void VOIDConfigWindow(int _)
+ {
+ GUILayout.BeginVertical();
+
+ this.DrawConfigurables();
+
+ GUILayout.EndVertical();
+ GUI.DragWindow();
+ }
+
+ public override void DrawConfigurables()
+ {
+ GUIContent _content;
+
+ if (HighLogic.LoadedSceneIsFlight)
+ {
+ 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");
+
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+ GUILayout.Label("Skin:", GUILayout.ExpandWidth(false));
+
+ _content = new GUIContent();
+
+ _content.text = "◄";
+ _content.tooltip = "Select previous skin";
+ if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
+ {
+ this.GUIStylesLoaded = false;
+ this._skinIdx--;
+ Tools.PostDebugMessage(string.Format(
+ "{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
+ this.GetType().Name,
+ this._skinName,
+ this.validSkins.Count
+ ));
+ }
+
+ _content.text = this.Skin.name;
+ _content.tooltip = "Current skin";
+ GUILayout.Label(_content, this.LabelStyles["center"], GUILayout.ExpandWidth(true));
+
+ _content.text = "►";
+ _content.tooltip = "Select next skin";
+ if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
+ {
+ this.GUIStylesLoaded = false;
+ this._skinIdx++;
+ Tools.PostDebugMessage(string.Format(
+ "{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
+ this.GetType().Name,
+ this._skinName,
+ this.validSkins.Count
+ ));
+ }
+
+ this._skinIdx %= this.skinNames.Length;
+ if (this._skinIdx < 0)
+ {
+ this._skinIdx += this.skinNames.Length;
+ }
+
+ if (this._skinName != skinNames[this._skinIdx])
+ {
+ this._skinName.value = skinNames[this._skinIdx];
+ }
+
+ GUILayout.EndHorizontal();
+
+ GUILayout.BeginHorizontal();
+ GUILayout.Label("Update Rate (Hz):");
+ if (this.stringFrequency == null)
+ {
+ this.stringFrequency = (1f / this.updatePeriod).ToString();
+ }
+ this.stringFrequency = GUILayout.TextField(this.stringFrequency.ToString(), 5, GUILayout.ExpandWidth(true));
+ // GUILayout.FlexibleSpace();
+ if (GUILayout.Button("Apply"))
+ {
+ double updateFreq = 1f / this.updatePeriod;
+ double.TryParse(stringFrequency, out updateFreq);
+ this._updatePeriod = 1 / updateFreq;
+ }
+ GUILayout.EndHorizontal();
+
+ foreach (IVOID_Module mod in this.Modules)
+ {
+ mod.DrawConfigurables();
+ }
+
+ this._factoryReset = GUILayout.Toggle(this._factoryReset, "Factory Reset");
+ }
+
+ 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);
+ }
+
+ this._modulesLoaded = true;
+
+ Tools.PostDebugMessage(string.Format(
+ "{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);
+ 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;
+ module.LoadConfig();
+ 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",
+ Resources.FindObjectsOfTypeAll(typeof(GUISkin))
+ .Select(s => s.ToString())
+ .ToArray()
+ )
+ );
+
+ this.validSkins = Resources.FindObjectsOfTypeAll(typeof(GUISkin))
+ .Where(s => !this.forbiddenSkins.Contains(s.name))
+ .Select(s => s as GUISkin)
+ .GroupBy(s => s.name)
+ .Select(g => g.First())
+ .ToDictionary(s => s.name);
+
+ Tools.PostDebugMessage(string.Format(
+ "{0}: loaded {1} GUISkins.",
+ this.GetType().Name,
+ this.validSkins.Count
+ ));
+
+ this.skinNames = this.validSkins.Keys.ToArray();
+ Array.Sort(this.skinNames);
+
+ int defaultIdx = int.MinValue;
+
+ for (int i = 0; i < this.skinNames.Length; i++)
+ {
+ if (this.skinNames[i] == this._skinName)
+ {
+ this._skinIdx = i;
+ }
+ if (this.skinNames[i] == this.defaultSkin)
+ {
+ defaultIdx = i;
+ }
+ if (this._skinIdx != int.MinValue && defaultIdx != int.MinValue)
+ {
+ break;
+ }
+ }
+
+ if (this._skinIdx == int.MinValue)
+ {
+ this._skinIdx = defaultIdx;
+ }
+
+ Tools.PostDebugMessage(string.Format(
+ "{0}: _skinIdx = {1}.",
+ this.GetType().Name,
+ this._skinName.ToString()
+ ));
+
+ this.skinsLoaded = true;
+ }
+
+ protected void LoadGUIStyles()
+ {
+ this.LabelStyles["link"] = new GUIStyle(GUI.skin.label);
+ this.LabelStyles["link"].fontStyle = FontStyle.Bold;
+
+ this.LabelStyles["center"] = new GUIStyle(GUI.skin.label);
+ this.LabelStyles["center"].normal.textColor = Color.white;
+ this.LabelStyles["center"].alignment = TextAnchor.UpperCenter;
+
+ this.LabelStyles["center_bold"] = new GUIStyle(GUI.skin.label);
+ this.LabelStyles["center_bold"].normal.textColor = Color.white;
+ this.LabelStyles["center_bold"].alignment = TextAnchor.UpperCenter;
+ this.LabelStyles["center_bold"].fontStyle = FontStyle.Bold;
+
+ this.LabelStyles["right"] = new GUIStyle(GUI.skin.label);
+ this.LabelStyles["right"].normal.textColor = Color.white;
+ this.LabelStyles["right"].alignment = TextAnchor.UpperRight;
+
+ this.LabelStyles["red"] = new GUIStyle(GUI.skin.label);
+ this.LabelStyles["red"].normal.textColor = Color.red;
+ this.LabelStyles["red"].alignment = TextAnchor.MiddleCenter;
+
+ this.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;
+ }
+
+ protected void LoadVesselTypes()
+ {
+ this._allVesselTypes = Enum.GetValues(typeof(VesselType)).OfType<VesselType>().ToList();
+ this.vesselTypesLoaded = true;
+ }
+
+ protected void LoadBeforeUpdate()
+ {
+ if (!this.vesselTypesLoaded)
+ {
+ this.LoadVesselTypes();
+ }
+ }
+
+ protected void InitializeToolbarButton()
+ {
+ this.ToolbarButton = ToolbarManager.Instance.add(this.VoidName, "coreToggle");
+ this.ToolbarButton.Text = this.VoidName;
+ this.SetIconTexture(this.powerState | this.activeState);
+
+ this.ToolbarButton.Visibility = new GameScenesVisibility(GameScenes.EDITOR, GameScenes.FLIGHT, GameScenes.SPH);
+
+ this.ToolbarButton.OnClick +=
+ (e) =>
+ {
+ this.ToggleMainWindow();
+ };
+
+ Tools.PostDebugMessage(string.Format("{0}: Toolbar Button initialized.", this.GetType().Name));
+ }
+
+ protected void ToggleMainWindow()
+ {
+ this.mainGuiMinimized = !this.mainGuiMinimized;
+ this.SetIconTexture(this.powerState | this.activeState);
+ }
+
+ 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.ToolbarButton != null)
+ {
+ this.ToolbarButton.TexturePath = texturePath;
+ }
+
+ this.VOIDIconTexture = GameDatabase.Instance.GetTexture(texturePath, false);
}
protected void CheckAndSave()
@@ -885,6 +958,62 @@
this.configDirty = false;
}
+
+ protected VOID_Core()
+ {
+ this._Name = "VOID Core";
+
+ this._Active.value = true;
+
+ this._skinName = this.defaultSkin;
+ this._skinIdx = int.MinValue;
+
+ this.VOIDIconOnInactivePath = "VOID/Textures/void_icon_light_glow";
+ this.VOIDIconOnActivePath = "VOID/Textures/void_icon_dark_glow";
+ this.VOIDIconOffInactivePath = "VOID/Textures/void_icon_light";
+ this.VOIDIconOffActivePath = "VOID/Textures/void_icon_dark";
+
+ this.UseToolbarManager = false;
+
+ this.LoadConfig();
+
+ this.SetIconTexture(this.powerState | this.activeState);
+ }
+
+ protected enum IconState
+ {
+ PowerOff = 1,
+ PowerOn = 2,
+ Inactive = 4,
+ Active = 8
+ }
+ }
+
+ public static partial class VOID_Data
+ {
+ public static VOID_Core core
+ {
+ get
+ {
+ return VOID_Core.Instance;
+ }
+ }
+
+ public static Engineer.VesselSimulator.SimManager simManager
+ {
+ get
+ {
+ return Engineer.VesselSimulator.SimManager.Instance;
+ }
+ }
+
+ public static double KerbinGee
+ {
+ get
+ {
+ return core.Kerbin.gravParameter / Math.Pow(core.Kerbin.Radius, 2);
+ }
+ }
}
}
--- a/VOID_DataValue.cs
+++ b/VOID_DataValue.cs
@@ -48,6 +48,7 @@
* */
protected T cache;
protected Func<T> ValueFunc;
+ protected float lastUpdate;
/*
* Properties
@@ -55,8 +56,17 @@
public string Label { get; protected set; }
public string Units { get; protected set; }
- public T Value {
- get {
+ public T Value
+ {
+ get
+ {
+ if (
+ (VOID_Core.Instance.updateTimer - this.lastUpdate > VOID_Core.Instance.updatePeriod) ||
+ (this.lastUpdate > VOID_Core.Instance.updateTimer)
+ )
+ {
+ this.Refresh();
+ }
return (T)this.cache;
}
}
@@ -69,11 +79,13 @@
this.Label = Label;
this.Units = Units;
this.ValueFunc = ValueFunc;
+ this.lastUpdate = 0;
}
public void Refresh()
{
this.cache = this.ValueFunc.Invoke ();
+ this.lastUpdate = VOID_Core.Instance.updateTimer;
}
public T GetFreshValue()
@@ -106,30 +118,94 @@
}
}
- internal interface IVOID_NumericValue
- {
- double ToDouble();
- string ToString(string format);
- string ToSIString(int digits, int MinMagnitude, int MaxMagnitude);
- }
-
- public abstract class VOID_NumValue<T> : VOID_DataValue<T>, IVOID_NumericValue
- {
- public VOID_NumValue(string Label, Func<T> ValueFunc, string Units = "") : base(Label, ValueFunc, Units) {}
-
- public abstract double ToDouble();
- public abstract string ToString(string Format);
- public abstract string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue);
-
- public abstract string ValueUnitString(string format);
+ public abstract class VOID_NumValue<T> : VOID_DataValue<T>
+ where T : IFormattable, IConvertible, IComparable
+ {
+ public static implicit operator Double(VOID_NumValue<T> v)
+ {
+ return v.ToDouble();
+ }
+
+ public static implicit operator Int32(VOID_NumValue<T> v)
+ {
+ return v.ToInt32();
+ }
+
+
+ public static implicit operator Single(VOID_NumValue<T> v)
+ {
+ return v.ToSingle();
+ }
+
+
+ protected IFormatProvider formatProvider;
+
+ public VOID_NumValue(string Label, Func<T> ValueFunc, string Units = "") : base(Label, ValueFunc, Units)
+ {
+ this.formatProvider = System.Globalization.CultureInfo.CurrentUICulture;
+ }
+
+ public virtual double ToDouble(IFormatProvider provider)
+ {
+ return this.Value.ToDouble(provider);
+ }
+
+ public virtual double ToDouble()
+ {
+ return this.ToDouble(this.formatProvider);
+ }
+
+ public virtual int ToInt32(IFormatProvider provider)
+ {
+ return this.Value.ToInt32(provider);
+ }
+
+ public virtual int ToInt32()
+ {
+ return this.ToInt32(this.formatProvider);
+ }
+
+ public virtual float ToSingle(IFormatProvider provider)
+ {
+ return this.Value.ToSingle(provider);
+ }
+
+ public virtual float ToSingle()
+ {
+ return this.ToSingle(this.formatProvider);
+ }
+
+ public virtual string ToString(string Format)
+ {
+ return string.Format (
+ "{0}: {1}{2}",
+ this.Label,
+ this.Value.ToString(Format, this.formatProvider),
+ this.Units
+ );
+ }
+
+ public virtual string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
+ {
+ return string.Format (
+ "{0}{1}",
+ Tools.MuMech_ToSI (this, digits, MinMagnitude, MaxMagnitude),
+ this.Units
+ );
+ }
+
+ public virtual string ValueUnitString(string format)
+ {
+ return this.Value.ToString(format, this.formatProvider) + this.Units;
+ }
public virtual string ValueUnitString(int digits) {
- return Tools.MuMech_ToSI(this.ToDouble(), digits) + this.Units;
+ return Tools.MuMech_ToSI(this, digits) + this.Units;
}
public virtual string ValueUnitString(int digits, int MinMagnitude, int MaxMagnitude)
{
- return Tools.MuMech_ToSI(this.ToDouble(), digits, MinMagnitude, MaxMagnitude) + this.Units;
+ return Tools.MuMech_ToSI(this, digits, MinMagnitude, MaxMagnitude) + this.Units;
}
public virtual void DoGUIHorizontal(string format)
@@ -162,7 +238,7 @@
float magnitude;
float magLimit;
- magnitude = (float)Math.Log10(Math.Abs(this.ToDouble()));
+ magnitude = (float)Math.Log10(Math.Abs(this));
magLimit = Mathf.Max(magnitude, 6f);
magLimit = Mathf.Round((float)Math.Ceiling(magLimit / 3f) * 3f);
@@ -198,103 +274,20 @@
}
}
- public class VOID_DoubleValue : VOID_NumValue<double>, IVOID_NumericValue
+ public class VOID_DoubleValue : VOID_NumValue<double>
{
public VOID_DoubleValue(string Label, Func<double> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
-
- public override double ToDouble ()
- {
- return this.Value;
- }
-
- public override string ToString(string format)
- {
- return string.Format (
- "{0}: {1}{2}",
- this.Label,
- this.Value.ToString (format),
- this.Units
- );
- }
-
- public override string ValueUnitString(string format) {
- return this.Value.ToString(format) + this.Units;
- }
-
- public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
- {
- return string.Format (
- "{0}{1}",
- Tools.MuMech_ToSI (this.Value, digits, MinMagnitude, MaxMagnitude),
- this.Units
- );
- }
- }
- public class VOID_FloatValue : VOID_NumValue<float>, IVOID_NumericValue
+ }
+
+ public class VOID_FloatValue : VOID_NumValue<float>
{
public VOID_FloatValue(string Label, Func<float> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
-
- public override double ToDouble ()
- {
- return (double)this.Value;
- }
-
- public override string ValueUnitString(string format) {
- return this.Value.ToString(format) + this.Units;
- }
-
- public override string ToString(string format)
- {
- return string.Format (
- "{0}: {1}{2}",
- this.Label,
- this.Value.ToString (format),
- this.Units
- );
- }
-
- public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
- {
- return string.Format (
- "{0}{1}",
- Tools.MuMech_ToSI ((double)this.Value, digits, MinMagnitude, MaxMagnitude),
- this.Units
- );
- }
- }
- public class VOID_IntValue : VOID_NumValue<int>, IVOID_NumericValue
+ }
+
+ public class VOID_IntValue : VOID_NumValue<int>
{
public VOID_IntValue(string Label, Func<int> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
-
- public override double ToDouble ()
- {
- return (double)this.Value;
- }
-
- public override string ValueUnitString(string format) {
- return this.Value.ToString(format) + this.Units;
- }
-
- public override string ToString(string format)
- {
- return string.Format (
- "{0}: {1}{2}",
- this.Label,
- this.Value.ToString (format),
- this.Units
- );
- }
-
- public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
- {
- return string.Format (
- "{0}{1}",
- Tools.MuMech_ToSI ((double)this.Value, digits, MinMagnitude, MaxMagnitude),
- this.Units
- );
- }
- }
-
+ }
public class VOID_StrValue : VOID_DataValue<string>
{
--- a/VOID_EditorCore.cs
+++ b/VOID_EditorCore.cs
@@ -122,7 +122,7 @@
if (EditorLogic.SortedShipList.Count > 0)
{
- SimManager.Instance.Gravity = 9.08665;
+ SimManager.Instance.Gravity = VOID_Data.KerbinGee;
SimManager.Instance.TryStartSimulation();
}
--- 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
@@ -20,10 +20,12 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
+using Engineer.VesselSimulator;
using KSP;
using UnityEngine;
using System;
using System.Collections.Generic;
+using System.Text;
namespace VOID
{
@@ -33,9 +35,20 @@
* Fields
* */
[AVOID_SaveValue("colorIndex")]
- protected VOID_SaveValue<int> _colorIndex = 0;
-
- protected List<Color> textColors = new List<Color>();
+ protected VOID_SaveValue<int> _colorIndex;
+
+ protected List<Color> textColors;
+
+ protected Rect leftHUDdefaultPos;
+ protected Rect rightHUDdefaultPos;
+
+ [AVOID_SaveValue("leftHUDPos")]
+ protected VOID_SaveValue<Rect> leftHUDPos;
+ [AVOID_SaveValue("rightHUDPos")]
+ protected VOID_SaveValue<Rect> rightHUDPos;
+
+ [AVOID_SaveValue("positionsLocked")]
+ protected VOID_SaveValue<bool> positionsLocked;
/*
* Properties
@@ -66,6 +79,10 @@
this._Name = "Heads-Up Display";
this._Active.value = true;
+
+ this._colorIndex = 0;
+
+ this.textColors = new List<Color>();
this.textColors.Add(Color.green);
this.textColors.Add(Color.black);
@@ -77,59 +94,229 @@
this.textColors.Add(Color.cyan);
this.textColors.Add(Color.magenta);
- VOID_Core.Instance.LabelStyles["hud"] = new GUIStyle();
- VOID_Core.Instance.LabelStyles["hud"].normal.textColor = this.textColors [this.ColorIndex];
+ this.leftHUDdefaultPos = new Rect(Screen.width * .375f - 300f, 0f, 300f, 90f);
+ this.leftHUDPos = new Rect(this.leftHUDdefaultPos);
+
+ this.rightHUDdefaultPos = new Rect(Screen.width * .625f, 0f, 300f, 90f);
+ this.rightHUDPos = new Rect(this.rightHUDdefaultPos);
+
+ this.positionsLocked = true;
Tools.PostDebugMessage ("VOID_HUD: Constructed.");
}
+ protected void leftHUDWindow(int id)
+ {
+ StringBuilder leftHUD;
+
+ leftHUD = new StringBuilder();
+
+ VOID_Core.Instance.LabelStyles["hud"].alignment = TextAnchor.UpperRight;
+
+ if (VOID_Core.Instance.powerAvailable)
+ {
+ leftHUD.AppendFormat("Primary: {0} Inc: {1}",
+ VOID_Data.primaryName.ValueUnitString(),
+ VOID_Data.orbitInclination.ValueUnitString("F3")
+ );
+ leftHUD.AppendFormat("\nObt Alt: {0} Obt Vel: {1}",
+ VOID_Data.orbitAltitude.ToSIString(),
+ VOID_Data.orbitVelocity.ToSIString()
+ );
+ leftHUD.AppendFormat("\nAp: {0} ETA {1}",
+ VOID_Data.orbitApoAlt.ToSIString(),
+ VOID_Data.timeToApo.ValueUnitString()
+ );
+ leftHUD.AppendFormat("\nPe: {0} ETA {1}",
+ VOID_Data.oribtPeriAlt.ToSIString(),
+ VOID_Data.timeToPeri.ValueUnitString()
+ );
+ leftHUD.AppendFormat("\nTot Δv: {0} Stg Δv: {1}",
+ VOID_Data.totalDeltaV.ToSIString(2),
+ VOID_Data.stageDeltaV.ToSIString(2)
+ );
+ }
+ else
+ {
+ VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
+ leftHUD.Append(string.Intern("-- POWER LOST --"));
+ }
+
+ GUILayout.Label(leftHUD.ToString(), VOID_Core.Instance.LabelStyles["hud"], GUILayout.ExpandWidth(true));
+
+ if (!this.positionsLocked)
+ {
+ GUI.DragWindow();
+ }
+
+ GUI.BringWindowToBack(id);
+ }
+
+ protected void rightHUDWindow(int id)
+ {
+ StringBuilder rightHUD;
+
+ rightHUD = new StringBuilder();
+
+ VOID_Core.Instance.LabelStyles["hud"].alignment = TextAnchor.UpperLeft;
+
+ if (VOID_Core.Instance.powerAvailable)
+ {
+ rightHUD.AppendFormat("Biome: {0} Sit: {1}",
+ VOID_Data.currBiome.ValueUnitString(),
+ VOID_Data.expSituation.ValueUnitString()
+ );
+ rightHUD.AppendFormat("\nSrf Alt: {0} Srf Vel: {1}",
+ VOID_Data.trueAltitude.ToSIString(),
+ VOID_Data.surfVelocity.ToSIString()
+ );
+ rightHUD.AppendFormat("\nVer: {0} Hor: {1}",
+ VOID_Data.vertVelocity.ToSIString(),
+ VOID_Data.horzVelocity.ToSIString()
+ );
+ rightHUD.AppendFormat("\nLat: {0} Lon: {1}",
+ VOID_Data.surfLatitude.ValueUnitString(),
+ VOID_Data.surfLongitude.ValueUnitString()
+ );
+ rightHUD.AppendFormat("\nHdg: {0} Pit: {1}",
+ VOID_Data.vesselHeading.ValueUnitString(),
+ VOID_Data.vesselPitch.ToSIString(2)
+ );
+ }
+ else
+ {
+ VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
+ rightHUD.Append(string.Intern("-- POWER LOST --"));
+ }
+
+
+ GUILayout.Label(rightHUD.ToString(), VOID_Core.Instance.LabelStyles["hud"], GUILayout.ExpandWidth(true));
+
+ if (!this.positionsLocked)
+ {
+ GUI.DragWindow();
+ }
+
+ GUI.BringWindowToBack(id);
+ }
+
public override void DrawGUI()
{
- GUI.skin = VOID_Core.Instance.Skin;
-
- if (VOID_Core.Instance.powerAvailable)
- {
- VOID_Core.Instance.LabelStyles["hud"].normal.textColor = textColors [ColorIndex];
-
- GUI.Label (
- new Rect ((Screen.width * .2083f), 0, 300f, 70f),
- "Obt Alt: " + Tools.MuMech_ToSI (vessel.orbit.altitude) + "m" +
- " Obt Vel: " + Tools.MuMech_ToSI (vessel.orbit.vel.magnitude) + "m/s" +
- "\nAp: " + Tools.MuMech_ToSI (vessel.orbit.ApA) + "m" +
- " ETA " + Tools.ConvertInterval (vessel.orbit.timeToAp) +
- "\nPe: " + Tools.MuMech_ToSI (vessel.orbit.PeA) + "m" +
- " ETA " + Tools.ConvertInterval (vessel.orbit.timeToPe) +
- "\nInc: " + vessel.orbit.inclination.ToString ("F3") + "°" +
- "\nPrimary: " + vessel.mainBody.bodyName,
- VOID_Core.Instance.LabelStyles["hud"]);
- // Toadicus edit: Added "Biome: " line to surf/atmo HUD
- GUI.Label (
- new Rect ((Screen.width * .625f), 0, 300f, 90f),
- "Srf Alt: " + Tools.MuMech_ToSI (Tools.TrueAltitude (vessel)) + "m" +
- " Srf Vel: " + Tools.MuMech_ToSI (vessel.srf_velocity.magnitude) + "m/s" +
- "\nVer: " + Tools.MuMech_ToSI (vessel.verticalSpeed) + "m/s" +
- " Hor: " + Tools.MuMech_ToSI (vessel.horizontalSrfSpeed) + "m/s" +
- "\nLat: " + Tools.GetLatitudeString (vessel, "F3") +
- " 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,
- VOID_Core.Instance.LabelStyles["hud"]);
- }
- else
- {
- VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
- GUI.Label (new Rect ((Screen.width * .2083f), 0, 300f, 70f), "-- POWER LOST --", VOID_Core.Instance.LabelStyles["hud"]);
- GUI.Label (new Rect ((Screen.width * .625f), 0, 300f, 70f), "-- POWER LOST --", VOID_Core.Instance.LabelStyles["hud"]);
- }
+ if (!VOID_Core.Instance.LabelStyles.ContainsKey("hud"))
+ {
+ VOID_Core.Instance.LabelStyles["hud"] = new GUIStyle(GUI.skin.label);
+ }
+
+ VOID_Core.Instance.LabelStyles["hud"].normal.textColor = textColors [ColorIndex];
+
+ if ((TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate))
+ {
+ SimManager.Instance.RequestSimulation();
+ }
+
+ this.leftHUDPos.value = GUI.Window(
+ VOID_Core.Instance.windowID,
+ this.leftHUDPos,
+ this.leftHUDWindow,
+ GUIContent.none,
+ GUIStyle.none
+ );
+
+ this.rightHUDPos.value = GUI.Window(
+ VOID_Core.Instance.windowID,
+ this.rightHUDPos,
+ this.rightHUDWindow,
+ GUIContent.none,
+ GUIStyle.none
+ );
}
public override void DrawConfigurables()
{
- if (GUILayout.Button ("Change HUD color", GUILayout.ExpandWidth (false)))
+ if (GUILayout.Button (string.Intern("Change HUD color"), GUILayout.ExpandWidth (false)))
{
++this.ColorIndex;
}
+
+ if (GUILayout.Button(string.Intern("Reset HUD Positions"), GUILayout.ExpandWidth(false)))
+ {
+ this.leftHUDPos = new Rect(this.leftHUDdefaultPos);
+ this.rightHUDPos = new Rect(this.rightHUDdefaultPos);
+ }
+
+ this.positionsLocked = GUILayout.Toggle(this.positionsLocked,
+ string.Intern("Lock HUD Positions"),
+ GUILayout.ExpandWidth(false));
+ }
+ }
+
+ public static partial class VOID_Data
+ {
+ public static readonly VOID_StrValue expSituation = new VOID_StrValue(
+ "Situation",
+ new Func<string> (() => VOID_Core.Instance.vessel.GetExperimentSituation().HumanString())
+ );
+
+ public static readonly VOID_DoubleValue vesselPitch = new VOID_DoubleValue(
+ "Pitch",
+ () => core.vessel.getSurfacePitch(),
+ "°"
+ );
+
+ public static readonly VOID_DoubleValue stageMassFlow = new VOID_DoubleValue(
+ "Stage Mass Flow",
+ delegate()
+ {
+ if (simManager.LastStage == null)
+ {
+ return double.NaN;
+ }
+
+ double stageIsp = simManager.LastStage.isp;
+ double stageThrust = simManager.LastStage.actualThrust;
+
+ return stageThrust / (stageIsp * KerbinGee);
+ },
+ "Mg/s"
+ );
+
+ public static readonly VOID_DoubleValue burnTimeCompleteAtNode = new VOID_DoubleValue(
+ "Full burn time to complete at node",
+ delegate()
+ {
+ if (simManager.LastStage == null)
+ {
+ return double.NaN;
+ }
+
+ double nextManeuverDV = core.vessel.patchedConicSolver.maneuverNodes[0].DeltaV.magnitude;
+ double stageThrust = simManager.LastStage.actualThrust;
+
+ return burnTime(nextManeuverDV, totalMass, stageMassFlow, stageThrust);
+ },
+ "s"
+ );
+
+ public static readonly VOID_DoubleValue burnTimeHalfDoneAtNode = new VOID_DoubleValue(
+ "Full burn time to be half done at node",
+ delegate()
+ {
+ if (simManager.LastStage == null)
+ {
+ return double.NaN;
+ }
+
+ double nextManeuverDV = core.vessel.patchedConicSolver.maneuverNodes[0].DeltaV.magnitude / 2d;
+ double stageThrust = simManager.LastStage.actualThrust;
+
+ return burnTime(nextManeuverDV, totalMass, stageMassFlow, stageThrust);
+ },
+ "s"
+ );
+
+ private static double burnTime(double deltaV, double initialMass, double massFlow, double thrust)
+ {
+ return initialMass / massFlow * (Math.Exp(deltaV * massFlow / thrust) - 1d);
}
}
}
--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -199,39 +199,39 @@
public virtual void ModuleWindow(int _)
{
- if (VOID_Core.Instance.updateTimer - this.lastUpdate > VOID_Core.Instance.updatePeriod) {
- foreach (var fieldinfo in this.GetType().GetFields(
- BindingFlags.Instance |
- BindingFlags.NonPublic |
- BindingFlags.Public |
- BindingFlags.FlattenHierarchy
- ))
- {
- object field = null;
-
- try
- {
- field = fieldinfo.GetValue (this);
- }
- catch (NullReferenceException) {
- Tools.PostDebugMessage(string.Format(
- "{0}: caught NullReferenceException, could not get value for field {1}.",
- this.GetType().Name,
- fieldinfo.Name
- ));
- }
-
- if (field == null) {
- continue;
- }
-
- if (typeof(IVOID_DataValue).IsAssignableFrom (field.GetType ())) {
- (field as IVOID_DataValue).Refresh ();
- }
- }
-
- this.lastUpdate = VOID_Core.Instance.updateTimer;
- }
+// if (VOID_Core.Instance.updateTimer - this.lastUpdate > VOID_Core.Instance.updatePeriod) {
+// foreach (var fieldinfo in this.GetType().GetFields(
+// BindingFlags.Instance |
+// BindingFlags.NonPublic |
+// BindingFlags.Public |
+// BindingFlags.FlattenHierarchy
+// ))
+// {
+// object field = null;
+//
+// try
+// {
+// field = fieldinfo.GetValue (this);
+// }
+// catch (NullReferenceException) {
+// Tools.PostDebugMessage(string.Format(
+// "{0}: caught NullReferenceException, could not get value for field {1}.",
+// this.GetType().Name,
+// fieldinfo.Name
+// ));
+// }
+//
+// if (field == null) {
+// continue;
+// }
+//
+// if (typeof(IVOID_DataValue).IsAssignableFrom (field.GetType ())) {
+// (field as IVOID_DataValue).Refresh ();
+// }
+// }
+//
+// this.lastUpdate = VOID_Core.Instance.updateTimer;
+// }
}
public override void DrawGUI()
--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -33,197 +33,201 @@
protected long _precisionValues = 230584300921369395;
protected IntCollection precisionValues;
- protected VOID_StrValue primaryName = new VOID_StrValue (
+ public VOID_Orbital()
+ {
+ this._Name = "Orbital Information";
+
+ this.WindowPos.x = Screen.width - 520f;
+ this.WindowPos.y = 250f;
+ }
+
+ public override void ModuleWindow(int _)
+ {
+ base.ModuleWindow (_);
+
+ int idx = 0;
+
+ GUILayout.BeginVertical();
+
+ VOID_Data.primaryName.DoGUIHorizontal ();
+
+ this.precisionValues [idx]= (ushort)VOID_Data.orbitAltitude.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ this.precisionValues [idx]= (ushort)VOID_Data.orbitVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ this.precisionValues [idx]= (ushort)VOID_Data.orbitApoAlt.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ VOID_Data.timeToApo.DoGUIHorizontal();
+
+ this.precisionValues [idx]= (ushort)VOID_Data.oribtPeriAlt.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ VOID_Data.timeToPeri.DoGUIHorizontal();
+
+ VOID_Data.orbitInclination.DoGUIHorizontal("F3");
+
+ this.precisionValues [idx]= (ushort)VOID_Data.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ this.toggleExtended.value = GUILayout.Toggle(this.toggleExtended, "Extended info");
+
+ if (this.toggleExtended)
+ {
+ VOID_Data.orbitPeriod.DoGUIHorizontal();
+
+ this.precisionValues [idx]= (ushort)VOID_Data.semiMajorAxis.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ VOID_Data.eccentricity.DoGUIHorizontal("F4");
+
+ VOID_Data.meanAnomaly.DoGUIHorizontal("F3");
+
+ VOID_Data.trueAnomaly.DoGUIHorizontal("F3");
+
+ VOID_Data.eccAnomaly.DoGUIHorizontal("F3");
+
+ VOID_Data.longitudeAscNode.DoGUIHorizontal("F3");
+
+ VOID_Data.argumentPeriapsis.DoGUIHorizontal("F3");
+
+ VOID_Data.localSiderealLongitude.DoGUIHorizontal("F3");
+ }
+
+ GUILayout.EndVertical();
+ GUI.DragWindow();
+ }
+
+ public override void LoadConfig ()
+ {
+ base.LoadConfig ();
+
+ this.precisionValues = new IntCollection (4, this._precisionValues);
+ }
+
+ public override void _SaveToConfig (KSP.IO.PluginConfiguration config)
+ {
+ this._precisionValues = this.precisionValues.collection;
+
+ base._SaveToConfig (config);
+ }
+ }
+
+
+ public static partial class VOID_Data
+ {
+ public static readonly VOID_StrValue primaryName = new VOID_StrValue (
VOIDLabels.void_primary,
new Func<string> (() => VOID_Core.Instance.vessel.mainBody.name)
);
- protected VOID_DoubleValue orbitAltitude = new VOID_DoubleValue (
+ public static readonly VOID_DoubleValue orbitAltitude = new VOID_DoubleValue (
"Altitude (ASL)",
new Func<double> (() => VOID_Core.Instance.vessel.orbit.altitude),
"m"
);
- protected VOID_DoubleValue orbitVelocity = new VOID_DoubleValue (
+ public static readonly VOID_DoubleValue orbitVelocity = new VOID_DoubleValue (
VOIDLabels.void_velocity,
new Func<double> (() => VOID_Core.Instance.vessel.orbit.vel.magnitude),
"m/s"
);
- protected VOID_DoubleValue orbitApoAlt = new VOID_DoubleValue(
+ public static readonly VOID_DoubleValue orbitApoAlt = new VOID_DoubleValue(
VOIDLabels.void_apoapsis,
new Func<double>(() => VOID_Core.Instance.vessel.orbit.ApA),
"m"
);
- protected VOID_DoubleValue oribtPeriAlt = new VOID_DoubleValue(
+ public static readonly VOID_DoubleValue oribtPeriAlt = new VOID_DoubleValue(
VOIDLabels.void_periapsis,
new Func<double>(() => VOID_Core.Instance.vessel.orbit.PeA),
"m"
);
- protected VOID_StrValue timeToApo = new VOID_StrValue(
- "Time to Apoapsis",
+ public static readonly VOID_StrValue timeToApo = new VOID_StrValue(
+ "Time to Apoapsis",
new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
);
- protected VOID_StrValue timeToPeri = new VOID_StrValue(
+ public static readonly VOID_StrValue timeToPeri = new VOID_StrValue(
"Time to Periapsis",
new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
);
- protected VOID_DoubleValue orbitInclination = new VOID_DoubleValue(
+ public static readonly VOID_DoubleValue orbitInclination = new VOID_DoubleValue(
"Inclination",
new Func<double>(() => VOID_Core.Instance.vessel.orbit.inclination),
"°"
);
- protected VOID_DoubleValue gravityAccel = new VOID_DoubleValue(
+ public static readonly VOID_DoubleValue gravityAccel = new VOID_DoubleValue(
"Gravity",
delegate()
- {
- double orbitRadius = VOID_Core.Instance.vessel.mainBody.Radius +
+ {
+ double orbitRadius = VOID_Core.Instance.vessel.mainBody.Radius +
VOID_Core.Instance.vessel.mainBody.GetAltitude(VOID_Core.Instance.vessel.findWorldCenterOfMass());
- return (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
+ return (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
Math.Pow(orbitRadius, 2);
- },
+ },
"m/s²"
);
- protected VOID_StrValue orbitPeriod = new VOID_StrValue(
+ public static readonly VOID_StrValue orbitPeriod = new VOID_StrValue(
"Period",
- new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
- );
-
- protected VOID_DoubleValue semiMajorAxis = new VOID_DoubleValue(
+ new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
+ );
+
+ public static readonly VOID_DoubleValue semiMajorAxis = new VOID_DoubleValue(
"Semi-Major Axis",
new Func<double>(() => VOID_Core.Instance.vessel.orbit.semiMajorAxis),
"m"
);
- protected VOID_DoubleValue eccentricity = new VOID_DoubleValue(
+ public static readonly VOID_DoubleValue eccentricity = new VOID_DoubleValue(
"Eccentricity",
new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricity),
""
);
- protected VOID_DoubleValue meanAnomaly = new VOID_DoubleValue(
+ public static readonly VOID_DoubleValue meanAnomaly = new VOID_DoubleValue(
"Mean Anomaly",
new Func<double>(() => VOID_Core.Instance.vessel.orbit.meanAnomaly * 180d / Math.PI),
"°"
);
- protected VOID_DoubleValue trueAnomaly = new VOID_DoubleValue(
+ public static readonly VOID_DoubleValue trueAnomaly = new VOID_DoubleValue(
"True Anomaly",
new Func<double>(() => VOID_Core.Instance.vessel.orbit.trueAnomaly),
"°"
);
- protected VOID_DoubleValue eccAnomaly = new VOID_DoubleValue(
- "Eccentric Anomaly",
+ public static readonly VOID_DoubleValue eccAnomaly = new VOID_DoubleValue(
+ "Eccentric Anomaly",
new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricAnomaly * 180d / Math.PI),
"°"
);
- protected VOID_DoubleValue longitudeAscNode = new VOID_DoubleValue(
+ public static readonly VOID_DoubleValue longitudeAscNode = new VOID_DoubleValue(
"Long. Ascending Node",
new Func<double>(() => VOID_Core.Instance.vessel.orbit.LAN),
"°"
);
- protected VOID_DoubleValue argumentPeriapsis = new VOID_DoubleValue(
+ public static readonly VOID_DoubleValue argumentPeriapsis = new VOID_DoubleValue(
"Argument of Periapsis",
new Func<double>(() => VOID_Core.Instance.vessel.orbit.argumentOfPeriapsis),
"°"
- );
-
- protected VOID_DoubleValue localSiderealLongitude = new VOID_DoubleValue(
+ );
+
+ public static readonly VOID_DoubleValue localSiderealLongitude = new VOID_DoubleValue(
"Local Sidereal Longitude",
new Func<double>(() => Tools.FixDegreeDomain(
VOID_Core.Instance.vessel.longitude + VOID_Core.Instance.vessel.orbit.referenceBody.rotationAngle)),
"°"
);
-
- public VOID_Orbital()
- {
- this._Name = "Orbital Information";
-
- this.WindowPos.x = Screen.width - 520f;
- this.WindowPos.y = 250f;
- }
-
- public override void ModuleWindow(int _)
- {
- base.ModuleWindow (_);
-
- int idx = 0;
-
- GUILayout.BeginVertical();
-
- this.primaryName.DoGUIHorizontal ();
-
- this.precisionValues [idx]= (ushort)this.orbitAltitude.DoGUIHorizontal (this.precisionValues [idx]);
- idx++;
-
- this.precisionValues [idx]= (ushort)this.orbitVelocity.DoGUIHorizontal (this.precisionValues [idx]);
- idx++;
-
- this.precisionValues [idx]= (ushort)this.orbitApoAlt.DoGUIHorizontal (this.precisionValues [idx]);
- idx++;
-
- this.timeToApo.DoGUIHorizontal();
-
- this.precisionValues [idx]= (ushort)this.oribtPeriAlt.DoGUIHorizontal (this.precisionValues [idx]);
- idx++;
-
- this.timeToPeri.DoGUIHorizontal();
-
- this.orbitInclination.DoGUIHorizontal("F3");
-
- this.precisionValues [idx]= (ushort)this.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
- idx++;
-
- this.toggleExtended.value = GUILayout.Toggle(this.toggleExtended, "Extended info");
-
- if (this.toggleExtended)
- {
- this.orbitPeriod.DoGUIHorizontal();
-
- this.precisionValues [idx]= (ushort)this.semiMajorAxis.DoGUIHorizontal (this.precisionValues [idx]);
- idx++;
-
- this.eccentricity.DoGUIHorizontal("F4");
-
- this.meanAnomaly.DoGUIHorizontal("F3");
-
- this.trueAnomaly.DoGUIHorizontal("F3");
-
- this.eccAnomaly.DoGUIHorizontal("F3");
-
- this.longitudeAscNode.DoGUIHorizontal("F3");
-
- this.argumentPeriapsis.DoGUIHorizontal("F3");
-
- this.localSiderealLongitude.DoGUIHorizontal("F3");
- }
-
- GUILayout.EndVertical();
- GUI.DragWindow();
- }
-
- public override void LoadConfig ()
- {
- base.LoadConfig ();
-
- this.precisionValues = new IntCollection (4, this._precisionValues);
- }
-
- public override void _SaveToConfig (KSP.IO.PluginConfiguration config)
- {
- this._precisionValues = this.precisionValues.collection;
-
- base._SaveToConfig (config);
- }
}
}
--- a/VOID_Rendezvous.cs
+++ b/VOID_Rendezvous.cs
@@ -59,13 +59,13 @@
if (FlightGlobals.fetch.VesselTarget != null)
{
//a KSP Target (body or vessel) is selected
- if (FlightGlobals.fetch.vesselTargetMode == FlightGlobals.VesselTargetModes.Direction)
+ if (FlightGlobals.fetch.vesselTargetMode == VesselTargetModes.Direction)
{
//a Body is selected
rendezbody = vessel.patchedConicSolver.targetBody;
display_rendezvous_info(null, rendezbody);
}
- else if (FlightGlobals.fetch.vesselTargetMode == FlightGlobals.VesselTargetModes.DirectionAndVelocity)
+ else if (FlightGlobals.fetch.vesselTargetMode == VesselTargetModes.DirectionAndVelocity)
{
//a Vessel is selected
rendezvessel = FlightGlobals.fetch.VesselTarget.GetVessel();
@@ -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_SurfAtmo.cs
+++ b/VOID_SurfAtmo.cs
@@ -30,98 +30,6 @@
protected long _precisionValues = 230584300921369395;
protected IntCollection precisionValues;
- protected VOID_DoubleValue trueAltitude = new VOID_DoubleValue(
- "Altitude (true)",
- delegate()
- {
- double alt_true = VOID_Core.Instance.vessel.orbit.altitude - VOID_Core.Instance.vessel.terrainAltitude;
- // HACK: This assumes that on worlds with oceans, all water is fixed at 0 m,
- // and water covers the whole surface at 0 m.
- if (VOID_Core.Instance.vessel.terrainAltitude < 0 && VOID_Core.Instance.vessel.mainBody.ocean )
- alt_true = VOID_Core.Instance.vessel.orbit.altitude;
- return alt_true;
- },
- "m"
- );
-
- protected VOID_StrValue surfLatitude = new VOID_StrValue(
- "Latitude",
- new Func<string> (() => Tools.GetLatitudeString(VOID_Core.Instance.vessel))
- );
-
- protected VOID_StrValue surfLongitude = new VOID_StrValue(
- "Longitude",
- new Func<string> (() => Tools.GetLongitudeString(VOID_Core.Instance.vessel))
- );
-
- protected VOID_StrValue vesselHeading = new VOID_StrValue(
- "Heading",
- delegate()
- {
- double heading = Tools.MuMech_get_heading(VOID_Core.Instance.vessel);
- string cardinal = Tools.get_heading_text(heading);
-
- return string.Format(
- "{0}° {1}",
- heading.ToString("F2"),
- cardinal
- );
- }
- );
-
- protected VOID_DoubleValue terrainElevation = new VOID_DoubleValue(
- "Terrain elevation",
- new Func<double> (() => VOID_Core.Instance.vessel.terrainAltitude),
- "m"
- );
-
- protected VOID_DoubleValue surfVelocity = new VOID_DoubleValue(
- "Surface velocity",
- new Func<double> (() => VOID_Core.Instance.vessel.srf_velocity.magnitude),
- "m/s"
- );
-
- protected VOID_DoubleValue vertVelocity = new VOID_DoubleValue(
- "Vertical speed",
- new Func<double> (() => VOID_Core.Instance.vessel.verticalSpeed),
- "m/s"
- );
-
- protected VOID_DoubleValue horzVelocity = new VOID_DoubleValue(
- "Horizontal speed",
- new Func<double> (() => VOID_Core.Instance.vessel.horizontalSrfSpeed),
- "m/s"
- );
-
- protected VOID_FloatValue temperature = new VOID_FloatValue(
- "Temperature",
- new Func<float> (() => VOID_Core.Instance.vessel.flightIntegrator.getExternalTemperature()),
- "°C"
- );
-
- protected VOID_DoubleValue atmDensity = new VOID_DoubleValue (
- "Atmosphere Density",
- new Func<double> (() => VOID_Core.Instance.vessel.atmDensity * 1000f),
- "g/m³"
- );
-
- protected VOID_DoubleValue atmPressure = new VOID_DoubleValue (
- "Pressure",
- new Func<double> (() => VOID_Core.Instance.vessel.staticPressure),
- "atm"
- );
-
- protected VOID_FloatValue atmLimit = new VOID_FloatValue(
- "Atmosphere Limit",
- new Func<float> (() => VOID_Core.Instance.vessel.mainBody.maxAtmosphereAltitude),
- "m"
- );
-
- protected VOID_StrValue currBiome = new VOID_StrValue(
- "Biome",
- new Func<string> (() => Tools.Toadicus_GetAtt(VOID_Core.Instance.vessel).name)
- );
-
public VOID_SurfAtmo()
{
this._Name = "Surface & Atmospheric Information";
@@ -138,38 +46,38 @@
GUILayout.BeginVertical();
- this.precisionValues [idx]= (ushort)this.trueAltitude.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)VOID_Data.trueAltitude.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
- this.surfLatitude.DoGUIHorizontal ();
+ VOID_Data.surfLatitude.DoGUIHorizontal ();
- this.surfLongitude.DoGUIHorizontal ();
+ VOID_Data.surfLongitude.DoGUIHorizontal ();
- this.vesselHeading.DoGUIHorizontal ();
+ VOID_Data.vesselHeading.DoGUIHorizontal ();
- this.precisionValues [idx]= (ushort)this.terrainElevation.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)VOID_Data.terrainElevation.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
- this.precisionValues [idx]= (ushort)this.surfVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)VOID_Data.surfVelocity.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
- this.precisionValues [idx]= (ushort)this.vertVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)VOID_Data.vertVelocity.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
- this.precisionValues [idx]= (ushort)this.horzVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)VOID_Data.horzVelocity.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
- this.temperature.DoGUIHorizontal ("F2");
+ VOID_Data.temperature.DoGUIHorizontal ("F2");
- this.atmDensity.DoGUIHorizontal (3);
+ VOID_Data.atmDensity.DoGUIHorizontal (3);
- this.atmPressure.DoGUIHorizontal ("F2");
+ VOID_Data.atmPressure.DoGUIHorizontal ("F2");
- this.precisionValues [idx]= (ushort)this.atmLimit.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)VOID_Data.atmLimit.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
// Toadicus edit: added Biome
- this.currBiome.DoGUIHorizontal ();
+ VOID_Data.currBiome.DoGUIHorizontal ();
GUILayout.EndVertical();
GUI.DragWindow();
@@ -189,4 +97,100 @@
base._SaveToConfig (config);
}
}
+
+ public static partial class VOID_Data
+ {
+ public static readonly VOID_DoubleValue trueAltitude = new VOID_DoubleValue(
+ "Altitude (true)",
+ delegate()
+ {
+ double alt_true = VOID_Core.Instance.vessel.orbit.altitude - VOID_Core.Instance.vessel.terrainAltitude;
+ // HACK: This assumes that on worlds with oceans, all water is fixed at 0 m,
+ // and water covers the whole surface at 0 m.
+ if (VOID_Core.Instance.vessel.terrainAltitude < 0 && VOID_Core.Instance.vessel.mainBody.ocean )
+ alt_true = VOID_Core.Instance.vessel.orbit.altitude;
+ return alt_true;
+ },
+ "m"
+ );
+
+ public static readonly VOID_StrValue surfLatitude = new VOID_StrValue(
+ "Latitude",
+ new Func<string> (() => Tools.GetLatitudeString(VOID_Core.Instance.vessel))
+ );
+
+ public static readonly VOID_StrValue surfLongitude = new VOID_StrValue(
+ "Longitude",
+ new Func<string> (() => Tools.GetLongitudeString(VOID_Core.Instance.vessel))
+ );
+
+ public static readonly VOID_StrValue vesselHeading = new VOID_StrValue(
+ "Heading",
+ delegate()
+ {
+ double heading = core.vessel.getSurfaceHeading();
+ string cardinal = Tools.get_heading_text(heading);
+
+ return string.Format(
+ "{0}° {1}",
+ heading.ToString("F2"),
+ cardinal
+ );
+ }
+ );
+
+ public static readonly VOID_DoubleValue terrainElevation = new VOID_DoubleValue(
+ "Terrain elevation",
+ new Func<double> (() => VOID_Core.Instance.vessel.terrainAltitude),
+ "m"
+ );
+
+ public static readonly VOID_DoubleValue surfVelocity = new VOID_DoubleValue(
+ "Surface velocity",
+ new Func<double> (() => VOID_Core.Instance.vessel.srf_velocity.magnitude),
+ "m/s"
+ );
+
+ public static readonly VOID_DoubleValue vertVelocity = new VOID_DoubleValue(
+ "Vertical speed",
+ new Func<double> (() => VOID_Core.Instance.vessel.verticalSpeed),
+ "m/s"
+ );
+
+ public static readonly VOID_DoubleValue horzVelocity = new VOID_DoubleValue(
+ "Horizontal speed",
+ new Func<double> (() => VOID_Core.Instance.vessel.horizontalSrfSpeed),
+ "m/s"
+ );
+
+ public static readonly VOID_FloatValue temperature = new VOID_FloatValue(
+ "Temperature",
+ new Func<float> (() => VOID_Core.Instance.vessel.flightIntegrator.getExternalTemperature()),
+ "°C"
+ );
+
+ public static readonly VOID_DoubleValue atmDensity = new VOID_DoubleValue (
+ "Atmosphere Density",
+ new Func<double> (() => VOID_Core.Instance.vessel.atmDensity * 1000f),
+ "g/m³"
+ );
+
+ public static readonly VOID_DoubleValue atmPressure = new VOID_DoubleValue (
+ "Pressure",
+ new Func<double> (() => VOID_Core.Instance.vessel.staticPressure),
+ "atm"
+ );
+
+ public static readonly VOID_FloatValue atmLimit = new VOID_FloatValue(
+ "Atmosphere Limit",
+ new Func<float> (() => VOID_Core.Instance.vessel.mainBody.maxAtmosphereAltitude),
+ "m"
+ );
+
+ public static readonly VOID_StrValue currBiome = new VOID_StrValue(
+ "Biome",
+ new Func<string> (() => Tools.Toadicus_GetAtt(VOID_Core.Instance.vessel).name)
+ );
+
+ }
}
--- a/VOID_Transfer.cs
+++ b/VOID_Transfer.cs
@@ -21,6 +21,7 @@
using KSP;
using System;
using System.Collections.Generic;
+using System.Linq;
using UnityEngine;
namespace VOID
--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -23,30 +23,111 @@
using System.Collections.Generic;
using UnityEngine;
using Engineer.VesselSimulator;
+using Engineer.Extensions;
namespace VOID
{
public class VOID_VesselInfo : VOID_WindowModule
{
- protected VOID_DoubleValue geeForce = new VOID_DoubleValue(
+ public VOID_VesselInfo() : base()
+ {
+ this._Name = "Vessel Information";
+
+ this.WindowPos.x = Screen.width - 260;
+ this.WindowPos.y = 450;
+ }
+
+ public override void ModuleWindow(int _)
+ {
+ base.ModuleWindow (_);
+
+ if ((TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate))
+ {
+ SimManager.Instance.RequestSimulation();
+ }
+
+ GUILayout.BeginVertical();
+
+ GUILayout.Label(
+ vessel.vesselName,
+ VOID_Core.Instance.LabelStyles["center_bold"],
+ GUILayout.ExpandWidth(true));
+
+ Tools.PostDebugMessage("Starting VesselInfo window.");
+
+ VOID_Data.geeForce.DoGUIHorizontal ("F2");
+
+ Tools.PostDebugMessage("GeeForce done.");
+
+ VOID_Data.partCount.DoGUIHorizontal ();
+
+ Tools.PostDebugMessage("PartCount done.");
+
+ VOID_Data.totalMass.DoGUIHorizontal ("F1");
+
+ Tools.PostDebugMessage("TotalMass done.");
+
+ VOID_Data.resourceMass.DoGUIHorizontal ("F1");
+
+ Tools.PostDebugMessage("ResourceMass done.");
+
+ VOID_Data.stageDeltaV.DoGUIHorizontal (3, false);
+
+ Tools.PostDebugMessage("Stage deltaV done.");
+
+ VOID_Data.totalDeltaV.DoGUIHorizontal (3, false);
+
+ Tools.PostDebugMessage("Total deltaV done.");
+
+ VOID_Data.mainThrottle.DoGUIHorizontal ("F0");
+
+ Tools.PostDebugMessage("MainThrottle done.");
+
+ VOID_Data.currmaxThrust.DoGUIHorizontal ();
+
+ Tools.PostDebugMessage("CurrMaxThrust done.");
+
+ VOID_Data.currmaxThrustWeight.DoGUIHorizontal ();
+
+ Tools.PostDebugMessage("CurrMaxTWR done.");
+
+ VOID_Data.surfaceThrustWeight.DoGUIHorizontal ("F2");
+
+ Tools.PostDebugMessage("surfaceTWR done.");
+
+ VOID_Data.intakeAirStatus.DoGUIHorizontal();
+
+ Tools.PostDebugMessage("intakeAirStatus done.");
+
+ GUILayout.EndVertical();
+
+ Tools.PostDebugMessage("VesselInfo window done.");
+
+ GUI.DragWindow();
+ }
+ }
+
+ public static partial class VOID_Data
+ {
+ public static readonly VOID_DoubleValue geeForce = new VOID_DoubleValue(
"G-force",
new Func<double>(() => VOID_Core.Instance.vessel.geeForce),
"gees"
);
- protected VOID_IntValue partCount = new VOID_IntValue(
+ public static readonly VOID_IntValue partCount = new VOID_IntValue(
"Parts",
new Func<int>(() => VOID_Core.Instance.vessel.Parts.Count),
""
);
- protected VOID_DoubleValue totalMass = new VOID_DoubleValue(
+ public static readonly VOID_DoubleValue totalMass = new VOID_DoubleValue(
"Total Mass",
- new Func<double>(() => VOID_Core.Instance.vessel.GetTotalMass()),
+ new Func<double> (() => SimManager.Instance.TryGetLastMass()),
"tons"
);
- protected VOID_DoubleValue resourceMass = new VOID_DoubleValue(
+ public static readonly VOID_DoubleValue resourceMass = new VOID_DoubleValue(
"Resource Mass",
delegate()
{
@@ -60,20 +141,20 @@
"tons"
);
- protected VOID_DoubleValue stageDeltaV = new VOID_DoubleValue(
+ public static readonly VOID_DoubleValue stageDeltaV = new VOID_DoubleValue(
"DeltaV (Current Stage)",
delegate()
{
if (SimManager.Instance.Stages == null ||
- SimManager.Instance.Stages.Length <= Staging.lastStage
- )
+ SimManager.Instance.Stages.Length <= Staging.lastStage
+ )
return double.NaN;
return SimManager.Instance.Stages[Staging.lastStage].deltaV;
},
"m/s"
);
- protected VOID_DoubleValue totalDeltaV = new VOID_DoubleValue(
+ public static readonly VOID_DoubleValue totalDeltaV = new VOID_DoubleValue(
"DeltaV (Total)",
delegate()
{
@@ -84,13 +165,13 @@
"m/s"
);
- protected VOID_FloatValue mainThrottle = new VOID_FloatValue(
+ public static readonly VOID_FloatValue mainThrottle = new VOID_FloatValue(
"Throttle",
new Func<float>(() => VOID_Core.Instance.vessel.ctrlState.mainThrottle * 100f),
"%"
);
- protected VOID_StrValue currmaxThrust = new VOID_StrValue(
+ public static readonly VOID_StrValue currmaxThrust = new VOID_StrValue(
"Thrust (curr/max)",
delegate()
{
@@ -108,7 +189,7 @@
}
);
- protected VOID_StrValue currmaxThrustWeight = new VOID_StrValue(
+ public static readonly VOID_StrValue currmaxThrustWeight = new VOID_StrValue(
"T:W (curr/max)",
delegate()
{
@@ -117,12 +198,12 @@
double currThrust = SimManager.Instance.LastStage.actualThrust;
double maxThrust = SimManager.Instance.LastStage.thrust;
- double mass = VOID_Core.Instance.vessel.GetTotalMass();
+ double mass = SimManager.Instance.TryGetLastMass();
double gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
- Math.Pow(
- VOID_Core.Instance.vessel.mainBody.Radius + VOID_Core.Instance.vessel.altitude,
- 2
- );
+ Math.Pow(
+ VOID_Core.Instance.vessel.mainBody.Radius + VOID_Core.Instance.vessel.altitude,
+ 2
+ );
double weight = mass * gravity;
return string.Format(
@@ -133,7 +214,7 @@
}
);
- protected VOID_DoubleValue surfaceThrustWeight = new VOID_DoubleValue(
+ public static readonly VOID_DoubleValue surfaceThrustWeight = new VOID_DoubleValue(
"Max T:W @ surface",
delegate()
{
@@ -141,9 +222,9 @@
return double.NaN;
double maxThrust = SimManager.Instance.LastStage.thrust;
- double mass = VOID_Core.Instance.vessel.GetTotalMass();
+ double mass = SimManager.Instance.TryGetLastMass();
double gravity = (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
- Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
+ Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
double weight = mass * gravity;
return maxThrust / weight;
@@ -151,56 +232,50 @@
""
);
- public VOID_VesselInfo() : base()
- {
- this._Name = "Vessel Information";
-
- this.WindowPos.x = Screen.width - 260;
- this.WindowPos.y = 450;
- }
-
- public override void ModuleWindow(int _)
- {
- base.ModuleWindow (_);
-
- if ((TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate))
- {
- SimManager.Instance.RequestSimulation();
- }
-
- Stage[] stages = SimManager.Instance.Stages;
-
- GUILayout.BeginVertical();
-
- GUILayout.Label(
- vessel.vesselName,
- VOID_Core.Instance.LabelStyles["center_bold"],
- GUILayout.ExpandWidth(true));
-
- this.geeForce.DoGUIHorizontal ("F2");
-
- this.partCount.DoGUIHorizontal ();
-
- this.totalMass.DoGUIHorizontal ("F1");
-
- this.resourceMass.DoGUIHorizontal ("F1");
-
- this.stageDeltaV.DoGUIHorizontal (3, false);
-
- this.totalDeltaV.DoGUIHorizontal (3, false);
-
- this.mainThrottle.DoGUIHorizontal ("F0");
-
- this.currmaxThrust.DoGUIHorizontal ();
-
- this.currmaxThrustWeight.DoGUIHorizontal ();
-
- this.surfaceThrustWeight.DoGUIHorizontal ("F2");
-
- GUILayout.EndVertical();
- GUI.DragWindow();
- }
+ public static readonly 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);
+ }
+ );
}
}
-
--- /dev/null
+++ b/Wrapper/Properties/AssemblyInfo.cs
@@ -1,1 +1,37 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+// Allgemeine Informationen über eine Assembly werden über die folgenden
+// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+// die mit einer Assembly verknüpft sind.
+[assembly: AssemblyTitle("Toolbar Wrapper for Kerbal Space Program")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ToolbarWrapper")]
+[assembly: AssemblyCopyright("Copyright © 2013-2014 Maik Schreiber")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar
+// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von
+// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
+[assembly: ComVisible(false)]
+
+// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+[assembly: Guid("bfd95a60-6335-4a59-a29e-438d806d8f2d")]
+
+// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+//
+// Hauptversion
+// Nebenversion
+// Buildnummer
+// Revision
+//
+// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
+// übernehmen, indem Sie "*" eingeben:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
--- /dev/null
+++ b/Wrapper/ToolbarWrapper.cs
@@ -1,1 +1,793 @@
-
+/*
+Copyright (c) 2013-2014, Maik Schreiber
+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.
+
+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 System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using UnityEngine;
+
+
+namespace VOID {
+
+
+
+ /**********************************************************\
+ * --- DO NOT EDIT BELOW THIS COMMENT --- *
+ * *
+ * This file contains classes and interfaces to use the *
+ * Toolbar Plugin without creating a hard dependency on it. *
+ * *
+ * There is nothing in this file that needs to be edited *
+ * by hand. *
+ * *
+ * --- DO NOT EDIT BELOW THIS COMMENT --- *
+ \**********************************************************/
+
+
+
+ /// <summary>
+ /// The global tool bar manager.
+ /// </summary>
+ public partial class ToolbarManager : IToolbarManager {
+ /// <summary>
+ /// Whether the Toolbar Plugin is available.
+ /// </summary>
+ public static bool ToolbarAvailable {
+ get {
+ if (toolbarAvailable == null) {
+ toolbarAvailable = Instance != null;
+ }
+ return (bool) toolbarAvailable;
+ }
+ }
+
+ /// <summary>
+ /// The global tool bar manager instance.
+ /// </summary>
+ public static IToolbarManager Instance {
+ get {
+ if ((toolbarAvailable != false) && (instance_ == null)) {
+ Type type = ToolbarTypes.getType("Toolbar.ToolbarManager");
+ if (type != null) {
+ object realToolbarManager = ToolbarTypes.getStaticProperty(type, "Instance").GetValue(null, null);
+ instance_ = new ToolbarManager(realToolbarManager);
+ }
+ }
+ return instance_;
+ }
+ }
+ }
+
+ #region interfaces
+
+ /// <summary>
+ /// A toolbar manager.
+ /// </summary>
+ public interface IToolbarManager {
+ /// <summary>
+ /// Adds a new button.
+ /// </summary>
+ /// <remarks>
+ /// To replace an existing button, just add a new button using the old button's namespace and ID.
+ /// Note that the new button will inherit the screen position of the old button.
+ /// </remarks>
+ /// <param name="ns">The new button's namespace. This is usually the plugin's name. Must not include special characters like '.'</param>
+ /// <param name="id">The new button's ID. This ID must be unique across all buttons in the namespace. Must not include special characters like '.'</param>
+ /// <returns>The button created.</returns>
+ IButton add(string ns, string id);
+ }
+
+ /// <summary>
+ /// Represents a clickable button.
+ /// </summary>
+ public interface IButton {
+ /// <summary>
+ /// The text displayed on the button. Set to null to hide text.
+ /// </summary>
+ /// <remarks>
+ /// The text can be changed at any time to modify the button's appearance. Note that since this will also
+ /// modify the button's size, this feature should be used sparingly, if at all.
+ /// </remarks>
+ /// <seealso cref="TexturePath"/>
+ string Text {
+ set;
+ get;
+ }
+
+ /// <summary>
+ /// The color the button text is displayed with. Defaults to Color.white.
+ /// </summary>
+ /// <remarks>
+ /// The text color can be changed at any time to modify the button's appearance.
+ /// </remarks>
+ Color TextColor {
+ set;
+ get;
+ }
+
+ /// <summary>
+ /// The path of a texture file to display an icon on the button. Set to null to hide icon.
+ /// </summary>
+ /// <remarks>
+ /// <para>
+ /// A texture path on a button will have precedence over text. That is, if both text and texture path
+ /// have been set on a button, the button will show the texture, not the text.
+ /// </para>
+ /// <para>
+ /// The texture size must not exceed 24x24 pixels.
+ /// </para>
+ /// <para>
+ /// The texture path must be relative to the "GameData" directory, and must not specify a file name suffix.
+ /// Valid example: MyAddon/Textures/icon_mybutton
+ /// </para>
+ /// <para>
+ /// The texture path can be changed at any time to modify the button's appearance.
+ /// </para>
+ /// </remarks>
+ /// <seealso cref="Text"/>
+ string TexturePath {
+ set;
+ get;
+ }
+
+ /// <summary>
+ /// The button's tool tip text. Set to null if no tool tip is desired.
+ /// </summary>
+ /// <remarks>
+ /// Tool Tip Text Should Always Use Headline Style Like This.
+ /// </remarks>
+ string ToolTip {
+ set;
+ get;
+ }
+
+ /// <summary>
+ /// Whether this button is currently visible or not. Can be used in addition to or as a replacement for <see cref="Visibility"/>.
+ /// </summary>
+ /// <remarks>
+ /// Setting this property to true does not affect the player's ability to hide the button using the configuration.
+ /// Conversely, setting this property to false does not enable the player to show the button using the configuration.
+ /// </remarks>
+ bool Visible {
+ set;
+ get;
+ }
+
+ /// <summary>
+ /// Determines this button's visibility. Can be used in addition to or as a replacement for <see cref="Visible"/>.
+ /// </summary>
+ /// <remarks>
+ /// The return value from IVisibility.Visible is subject to the same rules as outlined for
+ /// <see cref="Visible"/>.
+ /// </remarks>
+ IVisibility Visibility {
+ set;
+ get;
+ }
+
+ /// <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. In addition, this property does not reflect the
+ /// player's configuration of the button's visibility.
+ /// </remarks>
+ bool EffectivelyVisible {
+ get;
+ }
+
+ /// <summary>
+ /// Whether this button is currently enabled (clickable) or not. This does not affect the player's ability to
+ /// position the button on their toolbar.
+ /// </summary>
+ bool Enabled {
+ set;
+ get;
+ }
+
+ /// <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 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>
+ /// Setting this property to true does not affect the player's ability to hide the button using the
+ /// configuration.
+ /// </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>
+ bool Important {
+ set;
+ get;
+ }
+
+ /// <summary>
+ /// A drawable that is tied to the current button. This can be anything from a popup menu to
+ /// an informational window. Set to null to hide the drawable.
+ /// </summary>
+ IDrawable Drawable {
+ set;
+ get;
+ }
+
+ /// <summary>
+ /// Event handler that can be registered with to receive "on click" events.
+ /// </summary>
+ /// <example>
+ /// <code>
+ /// IButton button = ...
+ /// button.OnClick += (e) => {
+ /// Debug.Log("button clicked, mouseButton: " + e.MouseButton);
+ /// };
+ /// </code>
+ /// </example>
+ event ClickHandler OnClick;
+
+ /// <summary>
+ /// Event handler that can be registered with to receive "on mouse enter" events.
+ /// </summary>
+ /// <example>
+ /// <code>
+ /// IButton button = ...
+ /// button.OnMouseEnter += (e) => {
+ /// Debug.Log("mouse entered button");
+ /// };
+ /// </code>
+ /// </example>
+ event MouseEnterHandler OnMouseEnter;
+
+ /// <summary>
+ /// Event handler that can be registered with to receive "on mouse leave" events.
+ /// </summary>
+ /// <example>
+ /// <code>
+ /// IButton button = ...
+ /// button.OnMouseLeave += (e) => {
+ /// Debug.Log("mouse left button");
+ /// };
+ /// </code>
+ /// </example>
+ event MouseLeaveHandler OnMouseLeave;
+
+ /// <summary>
+ /// Permanently destroys this button so that it is no longer displayed.
+ /// Should be used when a plugin is stopped to remove leftover buttons.
+ /// </summary>
+ void Destroy();
+ }
+
+ /// <summary>
+ /// A drawable that is tied to a particular button. This can be anything from a popup menu
+ /// to an informational window.
+ /// </summary>
+ public interface IDrawable {
+ /// <summary>
+ /// Update any information. This is called once per frame.
+ /// </summary>
+ void Update();
+
+ /// <summary>
+ /// Draws GUI widgets for this drawable. This is the equivalent to the OnGUI() message in
+ /// <see cref="MonoBehaviour"/>.
+ /// </summary>
+ /// <remarks>
+ /// The drawable will be positioned near its parent toolbar according to the drawable's current
+ /// width/height.
+ /// </remarks>
+ /// <param name="position">The left/top position of where to draw this drawable.</param>
+ /// <returns>The current width/height of this drawable.</returns>
+ Vector2 Draw(Vector2 position);
+ }
+
+ #endregion
+
+ #region events
+
+ /// <summary>
+ /// Event describing a click on a button.
+ /// </summary>
+ public partial class ClickEvent : EventArgs {
+ /// <summary>
+ /// The button that has been clicked.
+ /// </summary>
+ public readonly IButton Button;
+
+ /// <summary>
+ /// The mouse button which the button was clicked with.
+ /// </summary>
+ /// <remarks>
+ /// Is 0 for left mouse button, 1 for right mouse button, and 2 for middle mouse button.
+ /// </remarks>
+ public readonly int MouseButton;
+ }
+
+ /// <summary>
+ /// An event handler that is invoked whenever a button has been clicked.
+ /// </summary>
+ /// <param name="e">An event describing the button click.</param>
+ public delegate void ClickHandler(ClickEvent e);
+
+ /// <summary>
+ /// Event describing the mouse pointer moving about a button.
+ /// </summary>
+ public abstract partial class MouseMoveEvent {
+ /// <summary>
+ /// The button in question.
+ /// </summary>
+ public readonly IButton button;
+ }
+
+ /// <summary>
+ /// Event describing the mouse pointer entering a button's area.
+ /// </summary>
+ public partial class MouseEnterEvent : MouseMoveEvent {
+ }
+
+ /// <summary>
+ /// Event describing the mouse pointer leaving a button's area.
+ /// </summary>
+ public partial class MouseLeaveEvent : MouseMoveEvent {
+ }
+
+ /// <summary>
+ /// An event handler that is invoked whenever the mouse pointer enters a button's area.
+ /// </summary>
+ /// <param name="e">An event describing the mouse pointer entering.</param>
+ public delegate void MouseEnterHandler(MouseEnterEvent e);
+
+ /// <summary>
+ /// An event handler that is invoked whenever the mouse pointer leaves a button's area.
+ /// </summary>
+ /// <param name="e">An event describing the mouse pointer leaving.</param>
+ public delegate void MouseLeaveHandler(MouseLeaveEvent e);
+
+ #endregion
+
+ #region visibility
+
+ /// <summary>
+ /// Determines visibility of a button.
+ /// </summary>
+ /// <seealso cref="IButton.Visibility"/>
+ public interface IVisibility {
+ /// <summary>
+ /// Whether a button is currently visible or not.
+ /// </summary>
+ /// <seealso cref="IButton.Visible"/>
+ bool Visible {
+ get;
+ }
+ }
+
+ /// <summary>
+ /// Determines visibility of a button in relation to the currently running game scene.
+ /// </summary>
+ /// <example>
+ /// <code>
+ /// IButton button = ...
+ /// button.Visibility = new GameScenesVisibility(GameScenes.EDITOR, GameScenes.SPH);
+ /// </code>
+ /// </example>
+ /// <seealso cref="IButton.Visibility"/>
+ public class GameScenesVisibility : IVisibility {
+ private GameScenes[] gameScenes;
+
+ public bool Visible {
+ get {
+ return (bool) visibleProperty.GetValue(realGameScenesVisibility, null);
+ }
+ }
+
+ private object realGameScenesVisibility;
+ private PropertyInfo visibleProperty;
+
+ public GameScenesVisibility(params GameScenes[] gameScenes) {
+ Type gameScenesVisibilityType = ToolbarTypes.getType("Toolbar.GameScenesVisibility");
+ realGameScenesVisibility = Activator.CreateInstance(gameScenesVisibilityType, new object[] { gameScenes });
+ visibleProperty = ToolbarTypes.getProperty(gameScenesVisibilityType, "Visible");
+ this.gameScenes = gameScenes;
+ }
+ }
+
+ #endregion
+
+ #region drawable
+
+ /// <summary>
+ /// A drawable that draws a popup menu.
+ /// </summary>
+ public partial class PopupMenuDrawable : IDrawable {
+ /// <summary>
+ /// Event handler that can be registered with to receive "any menu option clicked" events.
+ /// </summary>
+ public event Action OnAnyOptionClicked {
+ add {
+ onAnyOptionClickedEvent.AddEventHandler(realPopupMenuDrawable, value);
+ }
+ remove {
+ onAnyOptionClickedEvent.RemoveEventHandler(realPopupMenuDrawable, value);
+ }
+ }
+
+ private object realPopupMenuDrawable;
+ private MethodInfo updateMethod;
+ private MethodInfo drawMethod;
+ private MethodInfo addOptionMethod;
+ private MethodInfo addSeparatorMethod;
+ private MethodInfo destroyMethod;
+ private EventInfo onAnyOptionClickedEvent;
+
+ public PopupMenuDrawable() {
+ Type popupMenuDrawableType = ToolbarTypes.getType("Toolbar.PopupMenuDrawable");
+ realPopupMenuDrawable = Activator.CreateInstance(popupMenuDrawableType, null);
+ updateMethod = ToolbarTypes.getMethod(popupMenuDrawableType, "Update");
+ drawMethod = ToolbarTypes.getMethod(popupMenuDrawableType, "Draw");
+ addOptionMethod = ToolbarTypes.getMethod(popupMenuDrawableType, "AddOption");
+ addSeparatorMethod = ToolbarTypes.getMethod(popupMenuDrawableType, "AddSeparator");
+ destroyMethod = ToolbarTypes.getMethod(popupMenuDrawableType, "Destroy");
+ onAnyOptionClickedEvent = ToolbarTypes.getEvent(popupMenuDrawableType, "OnAnyOptionClicked");
+ }
+
+ public void Update() {
+ updateMethod.Invoke(realPopupMenuDrawable, null);
+ }
+
+ public Vector2 Draw(Vector2 position) {
+ return (Vector2) drawMethod.Invoke(realPopupMenuDrawable, new object[] { position });
+ }
+
+ /// <summary>
+ /// Adds a new option to the popup menu.
+ /// </summary>
+ /// <param name="text">The text of the option.</param>
+ /// <returns>A button that can be used to register clicks on the menu option.</returns>
+ public IButton AddOption(string text) {
+ object realButton = addOptionMethod.Invoke(realPopupMenuDrawable, new object[] { text });
+ return new Button(realButton, new ToolbarTypes());
+ }
+
+ /// <summary>
+ /// Adds a separator to the popup menu.
+ /// </summary>
+ public void AddSeparator() {
+ addSeparatorMethod.Invoke(realPopupMenuDrawable, null);
+ }
+
+ /// <summary>
+ /// Destroys this drawable. This must always be called before disposing of this drawable.
+ /// </summary>
+ public void Destroy() {
+ destroyMethod.Invoke(realPopupMenuDrawable, null);
+ }
+ }
+
+ #endregion
+
+ #region private implementations
+
+ public partial class ToolbarManager : IToolbarManager {
+ private static bool? toolbarAvailable = null;
+ private static IToolbarManager instance_;
+
+ private object realToolbarManager;
+ private MethodInfo addMethod;
+ private Dictionary<object, IButton> buttons = new Dictionary<object, IButton>();
+ private ToolbarTypes types = new ToolbarTypes();
+
+ private ToolbarManager(object realToolbarManager) {
+ this.realToolbarManager = realToolbarManager;
+
+ addMethod = ToolbarTypes.getMethod(types.iToolbarManagerType, "add");
+ }
+
+ public IButton add(string ns, string id) {
+ object realButton = addMethod.Invoke(realToolbarManager, new object[] { ns, id });
+ IButton button = new Button(realButton, types);
+ buttons.Add(realButton, button);
+ return button;
+ }
+ }
+
+ internal class Button : IButton {
+ private object realButton;
+ private ToolbarTypes types;
+ private Delegate realClickHandler;
+ private Delegate realMouseEnterHandler;
+ private Delegate realMouseLeaveHandler;
+
+ internal Button(object realButton, ToolbarTypes types) {
+ this.realButton = realButton;
+ this.types = types;
+
+ realClickHandler = attachEventHandler(types.button.onClickEvent, "clicked", realButton);
+ realMouseEnterHandler = attachEventHandler(types.button.onMouseEnterEvent, "mouseEntered", realButton);
+ realMouseLeaveHandler = attachEventHandler(types.button.onMouseLeaveEvent, "mouseLeft", realButton);
+ }
+
+ private Delegate attachEventHandler(EventInfo @event, string methodName, object realButton) {
+ MethodInfo method = GetType().GetMethod(methodName, BindingFlags.NonPublic | BindingFlags.Instance);
+ Delegate d = Delegate.CreateDelegate(@event.EventHandlerType, this, method);
+ @event.AddEventHandler(realButton, d);
+ return d;
+ }
+
+ public string Text {
+ set {
+ types.button.textProperty.SetValue(realButton, value, null);
+ }
+ get {
+ return (string) types.button.textProperty.GetValue(realButton, null);
+ }
+ }
+
+ public Color TextColor {
+ set {
+ types.button.textColorProperty.SetValue(realButton, value, null);
+ }
+ get {
+ return (Color) types.button.textColorProperty.GetValue(realButton, null);
+ }
+ }
+
+ public string TexturePath {
+ set {
+ types.button.texturePathProperty.SetValue(realButton, value, null);
+ }
+ get {
+ return (string) types.button.texturePathProperty.GetValue(realButton, null);
+ }
+ }
+
+ public string ToolTip {
+ set {
+ types.button.toolTipProperty.SetValue(realButton, value, null);
+ }
+ get {
+ return (string) types.button.toolTipProperty.GetValue(realButton, null);
+ }
+ }
+
+ public bool Visible {
+ set {
+ types.button.visibleProperty.SetValue(realButton, value, null);
+ }
+ get {
+ return (bool) types.button.visibleProperty.GetValue(realButton, null);
+ }
+ }
+
+ public IVisibility Visibility {
+ set {
+ object functionVisibility = null;
+ if (value != null) {
+ functionVisibility = Activator.CreateInstance(types.functionVisibilityType, new object[] { new Func<bool>(() => value.Visible) });
+ }
+ types.button.visibilityProperty.SetValue(realButton, functionVisibility, null);
+ visibility_ = value;
+ }
+ get {
+ return visibility_;
+ }
+ }
+ private IVisibility visibility_;
+
+ public bool EffectivelyVisible {
+ get {
+ return (bool) types.button.effectivelyVisibleProperty.GetValue(realButton, null);
+ }
+ }
+
+ public bool Enabled {
+ set {
+ types.button.enabledProperty.SetValue(realButton, value, null);
+ }
+ get {
+ return (bool) types.button.enabledProperty.GetValue(realButton, null);
+ }
+ }
+
+ public bool Important {
+ set {
+ types.button.importantProperty.SetValue(realButton, value, null);
+ }
+ get {
+ return (bool) types.button.importantProperty.GetValue(realButton, null);
+ }
+ }
+
+ public IDrawable Drawable {
+ set {
+ object functionDrawable = null;
+ if (value != null) {
+ functionDrawable = Activator.CreateInstance(types.functionDrawableType, new object[] {
+ new Action(() => value.Update()),
+ new Func<Vector2, Vector2>((pos) => value.Draw(pos))
+ });
+ }
+ types.button.drawableProperty.SetValue(realButton, functionDrawable, null);
+ drawable_ = value;
+ }
+ get {
+ return drawable_;
+ }
+ }
+ private IDrawable drawable_;
+
+ public event ClickHandler OnClick;
+
+ private void clicked(object realEvent) {
+ if (OnClick != null) {
+ OnClick(new ClickEvent(realEvent, this));
+ }
+ }
+
+ public event MouseEnterHandler OnMouseEnter;
+
+ private void mouseEntered(object realEvent) {
+ if (OnMouseEnter != null) {
+ OnMouseEnter(new MouseEnterEvent(this));
+ }
+ }
+
+ public event MouseLeaveHandler OnMouseLeave;
+
+ private void mouseLeft(object realEvent) {
+ if (OnMouseLeave != null) {
+ OnMouseLeave(new MouseLeaveEvent(this));
+ }
+ }
+
+ public void Destroy() {
+ detachEventHandler(types.button.onClickEvent, realClickHandler, realButton);
+ detachEventHandler(types.button.onMouseEnterEvent, realMouseEnterHandler, realButton);
+ detachEventHandler(types.button.onMouseLeaveEvent, realMouseLeaveHandler, realButton);
+
+ types.button.destroyMethod.Invoke(realButton, null);
+ }
+
+ private void detachEventHandler(EventInfo @event, Delegate d, object realButton) {
+ @event.RemoveEventHandler(realButton, d);
+ }
+ }
+
+ public partial class ClickEvent : EventArgs {
+ internal ClickEvent(object realEvent, IButton button) {
+ Type type = realEvent.GetType();
+ Button = button;
+ MouseButton = (int) type.GetField("MouseButton", BindingFlags.Public | BindingFlags.Instance).GetValue(realEvent);
+ }
+ }
+
+ public abstract partial class MouseMoveEvent : EventArgs {
+ internal MouseMoveEvent(IButton button) {
+ this.button = button;
+ }
+ }
+
+ public partial class MouseEnterEvent : MouseMoveEvent {
+ internal MouseEnterEvent(IButton button)
+ : base(button) {
+ }
+ }
+
+ public partial class MouseLeaveEvent : MouseMoveEvent {
+ internal MouseLeaveEvent(IButton button)
+ : base(button) {
+ }
+ }
+
+ internal class ToolbarTypes {
+ internal readonly Type iToolbarManagerType;
+ internal readonly Type functionVisibilityType;
+ internal readonly Type functionDrawableType;
+ internal readonly ButtonTypes button;
+
+ internal ToolbarTypes() {
+ iToolbarManagerType = getType("Toolbar.IToolbarManager");
+ functionVisibilityType = getType("Toolbar.FunctionVisibility");
+ functionDrawableType = getType("Toolbar.FunctionDrawable");
+
+ Type iButtonType = getType("Toolbar.IButton");
+ button = new ButtonTypes(iButtonType);
+ }
+
+ internal static Type getType(string name) {
+ return AssemblyLoader.loadedAssemblies
+ .SelectMany(a => a.assembly.GetExportedTypes())
+ .SingleOrDefault(t => t.FullName == name);
+ }
+
+ internal static PropertyInfo getProperty(Type type, string name) {
+ return type.GetProperty(name, BindingFlags.Public | BindingFlags.Instance);
+ }
+
+ internal static PropertyInfo getStaticProperty(Type type, string name) {
+ return type.GetProperty(name, BindingFlags.Public | BindingFlags.Static);
+ }
+
+ internal static EventInfo getEvent(Type type, string name) {
+ return type.GetEvent(name, BindingFlags.Public | BindingFlags.Instance);
+ }
+
+ internal static MethodInfo getMethod(Type type, string name) {
+ return type.GetMethod(name, BindingFlags.Public | BindingFlags.Instance);
+ }
+ }
+
+ internal class ButtonTypes {
+ internal readonly Type iButtonType;
+ internal readonly PropertyInfo textProperty;
+ internal readonly PropertyInfo textColorProperty;
+ internal readonly PropertyInfo texturePathProperty;
+ internal readonly PropertyInfo toolTipProperty;
+ internal readonly PropertyInfo visibleProperty;
+ internal readonly PropertyInfo visibilityProperty;
+ internal readonly PropertyInfo effectivelyVisibleProperty;
+ internal readonly PropertyInfo enabledProperty;
+ internal readonly PropertyInfo importantProperty;
+ internal readonly PropertyInfo drawableProperty;
+ internal readonly EventInfo onClickEvent;
+ internal readonly EventInfo onMouseEnterEvent;
+ internal readonly EventInfo onMouseLeaveEvent;
+ internal readonly MethodInfo destroyMethod;
+
+ internal ButtonTypes(Type iButtonType) {
+ this.iButtonType = iButtonType;
+
+ textProperty = ToolbarTypes.getProperty(iButtonType, "Text");
+ textColorProperty = ToolbarTypes.getProperty(iButtonType, "TextColor");
+ texturePathProperty = ToolbarTypes.getProperty(iButtonType, "TexturePath");
+ toolTipProperty = ToolbarTypes.getProperty(iButtonType, "ToolTip");
+ visibleProperty = ToolbarTypes.getProperty(iButtonType, "Visible");
+ visibilityProperty = ToolbarTypes.getProperty(iButtonType, "Visibility");
+ effectivelyVisibleProperty = ToolbarTypes.getProperty(iButtonType, "EffectivelyVisible");
+ enabledProperty = ToolbarTypes.getProperty(iButtonType, "Enabled");
+ importantProperty = ToolbarTypes.getProperty(iButtonType, "Important");
+ drawableProperty = ToolbarTypes.getProperty(iButtonType, "Drawable");
+ onClickEvent = ToolbarTypes.getEvent(iButtonType, "OnClick");
+ onMouseEnterEvent = ToolbarTypes.getEvent(iButtonType, "OnMouseEnter");
+ onMouseLeaveEvent = ToolbarTypes.getEvent(iButtonType, "OnMouseLeave");
+ destroyMethod = ToolbarTypes.getMethod(iButtonType, "Destroy");
+ }
+ }
+
+ #endregion
+}
+
--- /dev/null
+++ b/Wrapper/Wrapper.csproj
@@ -1,1 +1,59 @@
-
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{E258AB2C-E2BB-4ACA-B902-C98582041F69}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>ToolbarWrapper</RootNamespace>
+ <AssemblyName>ToolbarWrapper</AssemblyName>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile />
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Assembly-CSharp">
+ <HintPath>..\..\..\..\Programme\KSP_23_dev\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ <Reference Include="UnityEngine">
+ <HintPath>..\..\..\..\Programme\KSP_23_dev\KSP_Data\Managed\UnityEngine.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="ToolbarWrapper.cs" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>