VOID_EditorCore: Switched to VOID_Data.KerbinGee instead of doing the calculation here.
--- a/IntCollection.cs
+++ b/IntCollection.cs
@@ -59,7 +59,6 @@
return (ushort)((this.collection & (this.mask << idx)) >> idx);
}
set {
- Console.WriteLine (value);
if (idx < 0) {
idx += this.maxCount;
}
@@ -71,7 +70,6 @@
idx *= wordLength;
long packvalue = value & this.mask;
- Console.WriteLine (packvalue);
this.collection &= ~(this.mask << idx);
this.collection |= packvalue << idx;
--- a/Tools.cs
+++ b/Tools.cs
@@ -25,7 +25,6 @@
//
///////////////////////////////////////////////////////////////////////////////
-
using System;
using System.Collections.Generic;
using UnityEngine;
@@ -51,9 +50,13 @@
try
{
CBAttributeMap BiomeMap = vessel.mainBody.BiomeMap;
+
double lat = vessel.latitude * Math.PI / 180d;
double lon = vessel.longitude * Math.PI / 180d;
+ mapAttribute = BiomeMap.GetAtt(lat, lon);
+
+ /*
lon -= Math.PI / 2d;
if (lon < 0d)
@@ -64,7 +67,7 @@
float v = (float)(lat / Math.PI) + 0.5f;
float u = (float)(lon / (2d * Math.PI));
- Color pixelBilinear = BiomeMap.Map.GetPixelBilinear (u, v);
+ Color pixelBilinear = BiomeMap.Map.GetPixelBilinear(u, v);
mapAttribute = BiomeMap.defaultAttribute;
if (BiomeMap.Map != null)
@@ -85,7 +88,7 @@
float num = 1 / zero;
for (int j = 0; j < BiomeMap.Attributes.Length; ++j)
{
- Color mapColor = BiomeMap.Attributes [j].mapColor;
+ Color mapColor = BiomeMap.Attributes[j].mapColor;
float sqrMagnitude = ((Vector4)(mapColor - pixelBilinear)).sqrMagnitude;
if (sqrMagnitude < num)
{
@@ -103,6 +106,7 @@
}
}
}
+ */
}
catch (NullReferenceException)
{
@@ -113,7 +117,7 @@
return mapAttribute;
}
- public static string GetLongitudeString(Vessel vessel, string format="F4")
+ public static string GetLongitudeString(Vessel vessel, string format = "F4")
{
string dir_long = "W";
double v_long = vessel.longitude;
@@ -129,16 +133,18 @@
v_long -= 360d;
}
- if (v_long > 0) dir_long = "E";
+ if (v_long > 0)
+ dir_long = "E";
return string.Format("{0}° {1}", Math.Abs(v_long).ToString(format), dir_long);
}
- public static string GetLatitudeString(Vessel vessel, string format="F4")
+ public static string GetLatitudeString(Vessel vessel, string format = "F4")
{
string dir_lat = "S";
double v_lat = vessel.latitude;
- if (v_lat > 0) dir_lat = "N";
+ if (v_lat > 0)
+ dir_lat = "N";
return string.Format("{0}° {1}", Math.Abs(v_lat).ToString(format), dir_lat);
}
@@ -200,27 +206,35 @@
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 CoM;
+
+ try
+ {
+ CoM = vessel.findWorldCenterOfMass();
+ }
+ catch
+ {
+ return double.NaN;
+ }
+
Vector3d up = (CoM - vessel.mainBody.position).normalized;
Vector3d north = Vector3d.Exclude(
- up,
- (vessel.mainBody.position +
- vessel.mainBody.transform.up * (float)vessel.mainBody.Radius
- ) - CoM).normalized;
+ up,
+ (vessel.mainBody.position +
+ vessel.mainBody.transform.up * (float)vessel.mainBody.Radius
+ ) - CoM).normalized;
Quaternion rotationSurface = Quaternion.LookRotation(north, up);
Quaternion rotationvesselSurface = Quaternion.Inverse(
- Quaternion.Euler(90, 0, 0) *
- Quaternion.Inverse(vessel.transform.rotation) *
- rotationSurface);
+ Quaternion.Euler(90, 0, 0) *
+ Quaternion.Inverse(vessel.transform.rotation) *
+ rotationSurface);
return rotationvesselSurface.eulerAngles.y;
}
-
//From http://svn.mumech.com/KSP/trunk/MuMechLib/MuUtils.cs
public static string MuMech_ToSI(
double d, int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue
@@ -233,76 +247,76 @@
{
switch ((int)Math.Floor(exponent))
{
- case 0:
- case 1:
- case 2:
- return d.ToString("F" + digits);
- case 3:
- case 4:
- case 5:
- return (d / 1e3).ToString("F" + digits) + "k";
- case 6:
- case 7:
- case 8:
- return (d / 1e6).ToString("F" + digits) + "M";
- case 9:
- case 10:
- case 11:
- return (d / 1e9).ToString("F" + digits) + "G";
- case 12:
- case 13:
- case 14:
- return (d / 1e12).ToString("F" + digits) + "T";
- case 15:
- case 16:
- case 17:
- return (d / 1e15).ToString("F" + digits) + "P";
- case 18:
- case 19:
- case 20:
- return (d / 1e18).ToString("F" + digits) + "E";
- case 21:
- case 22:
- case 23:
- return (d / 1e21).ToString("F" + digits) + "Z";
- default:
- return (d / 1e24).ToString("F" + digits) + "Y";
+ case 0:
+ case 1:
+ case 2:
+ return d.ToString("F" + digits);
+ case 3:
+ case 4:
+ case 5:
+ return (d / 1e3).ToString("F" + digits) + "k";
+ case 6:
+ case 7:
+ case 8:
+ return (d / 1e6).ToString("F" + digits) + "M";
+ case 9:
+ case 10:
+ case 11:
+ return (d / 1e9).ToString("F" + digits) + "G";
+ case 12:
+ case 13:
+ case 14:
+ return (d / 1e12).ToString("F" + digits) + "T";
+ case 15:
+ case 16:
+ case 17:
+ return (d / 1e15).ToString("F" + digits) + "P";
+ case 18:
+ case 19:
+ case 20:
+ return (d / 1e18).ToString("F" + digits) + "E";
+ case 21:
+ case 22:
+ case 23:
+ return (d / 1e21).ToString("F" + digits) + "Z";
+ default:
+ return (d / 1e24).ToString("F" + digits) + "Y";
}
}
else if (exponent < 0)
{
switch ((int)Math.Floor(exponent))
{
- case -1:
- case -2:
- case -3:
- return (d * 1e3).ToString("F" + digits) + "m";
- case -4:
- case -5:
- case -6:
- return (d * 1e6).ToString("F" + digits) + "μ";
- case -7:
- case -8:
- case -9:
- return (d * 1e9).ToString("F" + digits) + "n";
- case -10:
- case -11:
- case -12:
- return (d * 1e12).ToString("F" + digits) + "p";
- case -13:
- case -14:
- case -15:
- return (d * 1e15).ToString("F" + digits) + "f";
- case -16:
- case -17:
- case -18:
- return (d * 1e18).ToString("F" + digits) + "a";
- case -19:
- case -20:
- case -21:
- return (d * 1e21).ToString("F" + digits) + "z";
- default:
- return (d * 1e24).ToString("F" + digits) + "y";
+ case -1:
+ case -2:
+ case -3:
+ return (d * 1e3).ToString("F" + digits) + "m";
+ case -4:
+ case -5:
+ case -6:
+ return (d * 1e6).ToString("F" + digits) + "μ";
+ case -7:
+ case -8:
+ case -9:
+ return (d * 1e9).ToString("F" + digits) + "n";
+ case -10:
+ case -11:
+ case -12:
+ return (d * 1e12).ToString("F" + digits) + "p";
+ case -13:
+ case -14:
+ case -15:
+ return (d * 1e15).ToString("F" + digits) + "f";
+ case -16:
+ case -17:
+ case -18:
+ return (d * 1e18).ToString("F" + digits) + "a";
+ case -19:
+ case -20:
+ case -21:
+ return (d * 1e21).ToString("F" + digits) + "z";
+ default:
+ return (d * 1e24).ToString("F" + digits) + "y";
}
}
else
@@ -371,9 +385,7 @@
a[0] = char.ToUpper(a[0]);
return new string(a);
}
-
//transfer angles
-
public static double Nivvy_CalcTransferPhaseAngle(double r_current, double r_target, double grav_param)
{
double T_target = (2 * Math.PI) * Math.Sqrt(Math.Pow((r_target / 1000), 3) / (grav_param / 1000000000));
@@ -447,25 +459,42 @@
// returns the ejection angle
}
- public static double Adammada_CurrrentPhaseAngle(double body_LAN, double body_orbitPct, double origin_LAN, double origin_orbitPct)
+ public static double Adammada_CurrrentPhaseAngle(
+ double body_LAN,
+ double body_orbitPct,
+ double origin_LAN,
+ double origin_orbitPct
+ )
{
double angle = (body_LAN / 360 + body_orbitPct) - (origin_LAN / 360 + origin_orbitPct);
- if (angle > 1) angle = angle - 1;
- if (angle < 0) angle = angle + 1;
- if (angle > 0.5) angle = angle - 1;
+ if (angle > 1)
+ angle = angle - 1;
+ if (angle < 0)
+ angle = angle + 1;
+ if (angle > 0.5)
+ angle = angle - 1;
angle = angle * 360;
return angle;
}
- public static double Adammada_CurrentEjectionAngle(double vessel_long, double origin_rotAngle, double origin_LAN, double origin_orbitPct)
+ public static double Adammada_CurrentEjectionAngle(
+ double vessel_long,
+ double origin_rotAngle,
+ double origin_LAN,
+ double origin_orbitPct
+ )
{
//double eangle = ((FlightGlobals.ActiveVOID.vessel.longitude + orbiting.rotationAngle) - (orbiting.orbit.LAN / 360 + orbiting.orbit.orbitPercent) * 360);
double eangle = ((vessel_long + origin_rotAngle) - (origin_LAN / 360 + origin_orbitPct) * 360);
- while (eangle < 0) eangle = eangle + 360;
- while (eangle > 360) eangle = eangle - 360;
- if (eangle < 270) eangle = 90 - eangle;
- else eangle = 450 - eangle;
+ while (eangle < 0)
+ eangle = eangle + 360;
+ while (eangle > 360)
+ eangle = eangle - 360;
+ if (eangle < 270)
+ eangle = 90 - eangle;
+ else
+ eangle = 450 - eangle;
return eangle;
}
@@ -492,7 +521,8 @@
double phase = Vector3d.Angle(vecthis, vectarget);
- if (Vector3d.Angle(prograde, vectarget) > 90) phase = 360 - phase;
+ if (Vector3d.Angle(prograde, vectarget) > 90)
+ phase = 360 - phase;
return (phase + 360) % 360;
}
@@ -500,7 +530,8 @@
public static double FixAngleDomain(double Angle, bool Degrees = false)
{
double Extent = 2d * Math.PI;
- if (Degrees) {
+ if (Degrees)
+ {
Extent = 360d;
}
@@ -515,20 +546,24 @@
public static double FixDegreeDomain(double Angle)
{
- return FixAngleDomain (Angle, true);
+ return FixAngleDomain(Angle, true);
}
public static double adjustCurrPhaseAngle(double transfer_angle, double curr_phase)
{
if (transfer_angle < 0)
{
- if (curr_phase > 0) return (-1 * (360 - curr_phase));
- else if (curr_phase < 0) return curr_phase;
+ if (curr_phase > 0)
+ return (-1 * (360 - curr_phase));
+ else if (curr_phase < 0)
+ return curr_phase;
}
else if (transfer_angle > 0)
{
- if (curr_phase > 0) return curr_phase;
- else if (curr_phase < 0) return (360 + curr_phase);
+ if (curr_phase > 0)
+ return curr_phase;
+ else if (curr_phase < 0)
+ return (360 + curr_phase);
}
return curr_phase;
}
@@ -546,8 +581,10 @@
// if < 0, add curr to 360 // 360 + (-17) = 343
// else its good as it is
- if (curr_ejection < 0) return 360 + curr_ejection;
- else return curr_ejection;
+ if (curr_ejection < 0)
+ return 360 + curr_ejection;
+ else
+ return curr_ejection;
}
@@ -557,8 +594,10 @@
//180 + curr_ejection
// else if transfer_phase_angle > 0 its good as it is
- if (trans_phase < 0) return 180 + trans_ejection;
- else return trans_ejection;
+ if (trans_phase < 0)
+ return 180 + trans_ejection;
+ else
+ return trans_ejection;
}
@@ -568,7 +607,7 @@
// HACK: This assumes that on worlds with oceans, all water is fixed at 0 m,
// and water covers the whole surface at 0 m.
- if (vessel.terrainAltitude < 0 && vessel.mainBody.ocean )
+ if (vessel.terrainAltitude < 0 && vessel.mainBody.ocean)
{
trueAltitude = vessel.orbit.altitude;
}
@@ -578,50 +617,107 @@
public static string get_heading_text(double heading)
{
- if (heading > 348.75 || heading <= 11.25) return "N";
- else if (heading > 11.25 && heading <= 33.75) return "NNE";
- else if (heading > 33.75 && heading <= 56.25) return "NE";
- else if (heading > 56.25 && heading <= 78.75) return "ENE";
- else if (heading > 78.75 && heading <= 101.25) return "E";
- else if (heading > 101.25 && heading <= 123.75) return "ESE";
- else if (heading > 123.75 && heading <= 146.25) return "SE";
- else if (heading > 146.25 && heading <= 168.75) return "SSE";
- else if (heading > 168.75 && heading <= 191.25) return "S";
- else if (heading > 191.25 && heading <= 213.75) return "SSW";
- else if (heading > 213.75 && heading <= 236.25) return "SW";
- else if (heading > 236.25 && heading <= 258.75) return "WSW";
- else if (heading > 258.75 && heading <= 281.25) return "W";
- else if (heading > 281.25 && heading <= 303.75) return "WNW";
- else if (heading > 303.75 && heading <= 326.25) return "NW";
- else if (heading > 326.25 && heading <= 348.75) return "NNW";
- else return "";
- }
-
-
+ if (heading > 348.75 || heading <= 11.25)
+ return "N";
+ else if (heading > 11.25 && heading <= 33.75)
+ return "NNE";
+ else if (heading > 33.75 && heading <= 56.25)
+ return "NE";
+ else if (heading > 56.25 && heading <= 78.75)
+ return "ENE";
+ else if (heading > 78.75 && heading <= 101.25)
+ return "E";
+ else if (heading > 101.25 && heading <= 123.75)
+ return "ESE";
+ else if (heading > 123.75 && heading <= 146.25)
+ return "SE";
+ else if (heading > 146.25 && heading <= 168.75)
+ return "SSE";
+ else if (heading > 168.75 && heading <= 191.25)
+ return "S";
+ else if (heading > 191.25 && heading <= 213.75)
+ return "SSW";
+ else if (heading > 213.75 && heading <= 236.25)
+ return "SW";
+ else if (heading > 236.25 && heading <= 258.75)
+ return "WSW";
+ else if (heading > 258.75 && heading <= 281.25)
+ return "W";
+ else if (heading > 281.25 && heading <= 303.75)
+ return "WNW";
+ else if (heading > 303.75 && heading <= 326.25)
+ return "NW";
+ else if (heading > 326.25 && heading <= 348.75)
+ return "NNW";
+ else
+ return "";
+ }
public static void display_transfer_angles_SUN2PLANET(CelestialBody body, Vessel vessel)
{
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Phase angle (curr/trans):");
- GUILayout.Label(Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + Tools.Nivvy_CalcTransferPhaseAngle(vessel.orbit.semiMajorAxis, body.orbit.semiMajorAxis, vessel.mainBody.gravParameter).ToString("F3") + "°", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + Tools.Nivvy_CalcTransferPhaseAngle(
+ vessel.orbit.semiMajorAxis,
+ body.orbit.semiMajorAxis,
+ vessel.mainBody.gravParameter
+ ).ToString("F3") + "°",
+ GUILayout.ExpandWidth(false)
+ );
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Transfer velocity:");
- GUILayout.Label((Tools.Younata_DeltaVToGetToOtherBody((vessel.mainBody.gravParameter / 1000000000), (vessel.orbit.semiMajorAxis / 1000), (body.orbit.semiMajorAxis / 1000)) * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ (Tools.Younata_DeltaVToGetToOtherBody(
+ (vessel.mainBody.gravParameter / 1000000000),
+ (vessel.orbit.semiMajorAxis / 1000),
+ (body.orbit.semiMajorAxis / 1000)
+ ) * 1000).ToString("F2") + "m/s",
+ GUILayout.ExpandWidth(false)
+ );
GUILayout.EndHorizontal();
}
public static void display_transfer_angles_PLANET2PLANET(CelestialBody body, Vessel vessel)
{
- double dv1 = Tools.Younata_DeltaVToGetToOtherBody((vessel.mainBody.referenceBody.gravParameter / 1000000000), (vessel.mainBody.orbit.semiMajorAxis / 1000), (body.orbit.semiMajorAxis / 1000));
- double dv2 = Tools.Younata_DeltaVToExitSOI((vessel.mainBody.gravParameter / 1000000000), (vessel.orbit.semiMajorAxis / 1000), (vessel.mainBody.sphereOfInfluence / 1000), Math.Abs(dv1));
-
- double trans_ejection_angle = Tools.Younata_TransferBurnPoint((vessel.orbit.semiMajorAxis / 1000), dv2, (Math.PI / 2.0), (vessel.mainBody.gravParameter / 1000000000));
- double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(FlightGlobals.ActiveVessel.longitude, FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent);
-
- double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(vessel.mainBody.orbit.semiMajorAxis, body.orbit.semiMajorAxis, vessel.mainBody.referenceBody.gravParameter) % 360;
- double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(body.orbit.LAN, body.orbit.orbitPercent, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent);
+ double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+ (vessel.mainBody.referenceBody.gravParameter / 1000000000),
+ (vessel.mainBody.orbit.semiMajorAxis / 1000),
+ (body.orbit.semiMajorAxis / 1000)
+ );
+ double dv2 = Tools.Younata_DeltaVToExitSOI(
+ (vessel.mainBody.gravParameter / 1000000000),
+ (vessel.orbit.semiMajorAxis / 1000),
+ (vessel.mainBody.sphereOfInfluence / 1000),
+ Math.Abs(dv1)
+ );
+
+ double trans_ejection_angle = Tools.Younata_TransferBurnPoint(
+ (vessel.orbit.semiMajorAxis / 1000),
+ dv2,
+ (Math.PI / 2.0),
+ (vessel.mainBody.gravParameter / 1000000000)
+ );
+ double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(
+ FlightGlobals.ActiveVessel.longitude,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+ );
+
+ double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+ vessel.mainBody.orbit.semiMajorAxis,
+ body.orbit.semiMajorAxis,
+ vessel.mainBody.referenceBody.gravParameter
+ ) % 360;
+ double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(
+ body.orbit.LAN,
+ body.orbit.orbitPercent,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+ );
double adj_phase_angle = Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
double adj_trans_ejection_angle = Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
@@ -629,12 +725,18 @@
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Phase angle (curr/trans):");
- GUILayout.Label(adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+ GUILayout.ExpandWidth(false)
+ );
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Ejection angle (curr/trans):");
- GUILayout.Label(adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°",
+ GUILayout.ExpandWidth(false)
+ );
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -645,13 +747,24 @@
public static void display_transfer_angles_PLANET2MOON(CelestialBody body, Vessel vessel)
{
- double dv1 = Tools.Younata_DeltaVToGetToOtherBody((vessel.mainBody.gravParameter / 1000000000), (vessel.orbit.semiMajorAxis / 1000), (body.orbit.semiMajorAxis / 1000));
-
- double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(vessel.orbit.semiMajorAxis, body.orbit.semiMajorAxis, vessel.mainBody.gravParameter);
+ double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+ (vessel.mainBody.gravParameter / 1000000000),
+ (vessel.orbit.semiMajorAxis / 1000),
+ (body.orbit.semiMajorAxis / 1000)
+ );
+
+ double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+ vessel.orbit.semiMajorAxis,
+ body.orbit.semiMajorAxis,
+ vessel.mainBody.gravParameter
+ );
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Phase angle (curr/trans):");
- GUILayout.Label(Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+ GUILayout.ExpandWidth(false)
+ );
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -662,14 +775,42 @@
public static void display_transfer_angles_MOON2MOON(CelestialBody body, Vessel vessel)
{
- double dv1 = Tools.Younata_DeltaVToGetToOtherBody((vessel.mainBody.referenceBody.gravParameter / 1000000000), (vessel.mainBody.orbit.semiMajorAxis / 1000), (body.orbit.semiMajorAxis / 1000));
- double dv2 = Tools.Younata_DeltaVToExitSOI((vessel.mainBody.gravParameter / 1000000000), (vessel.orbit.semiMajorAxis / 1000), (vessel.mainBody.sphereOfInfluence / 1000), Math.Abs(dv1));
- double trans_ejection_angle = Tools.Younata_TransferBurnPoint((vessel.orbit.semiMajorAxis / 1000), dv2, (Math.PI / 2.0), (vessel.mainBody.gravParameter / 1000000000));
-
- double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(body.orbit.LAN, body.orbit.orbitPercent, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent);
- double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(FlightGlobals.ActiveVessel.longitude, FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent);
-
- double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(vessel.mainBody.orbit.semiMajorAxis, body.orbit.semiMajorAxis, vessel.mainBody.referenceBody.gravParameter) % 360;
+ double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+ (vessel.mainBody.referenceBody.gravParameter / 1000000000),
+ (vessel.mainBody.orbit.semiMajorAxis / 1000),
+ (body.orbit.semiMajorAxis / 1000)
+ );
+ double dv2 = Tools.Younata_DeltaVToExitSOI(
+ (vessel.mainBody.gravParameter / 1000000000),
+ (vessel.orbit.semiMajorAxis / 1000),
+ (vessel.mainBody.sphereOfInfluence / 1000),
+ Math.Abs(dv1)
+ );
+ double trans_ejection_angle = Tools.Younata_TransferBurnPoint(
+ (vessel.orbit.semiMajorAxis / 1000),
+ dv2,
+ (Math.PI / 2.0),
+ (vessel.mainBody.gravParameter / 1000000000)
+ );
+
+ double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(
+ body.orbit.LAN,
+ body.orbit.orbitPercent,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+ );
+ double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(
+ FlightGlobals.ActiveVessel.longitude,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+ FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+ );
+
+ double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+ vessel.mainBody.orbit.semiMajorAxis,
+ body.orbit.semiMajorAxis,
+ vessel.mainBody.referenceBody.gravParameter
+ ) % 360;
double adj_phase_angle = Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
//double adj_ejection_angle = adjustCurrEjectionAngle(trans_phase_angle, curr_ejection_angle);
@@ -683,12 +824,18 @@
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Phase angle (curr/trans):");
- GUILayout.Label(adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+ GUILayout.ExpandWidth(false)
+ );
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Ejection angle (curr/trans):");
- GUILayout.Label(adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+ GUILayout.Label(
+ adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°",
+ GUILayout.ExpandWidth(false)
+ );
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -696,12 +843,11 @@
GUILayout.Label((dv2 * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
GUILayout.EndHorizontal();
}
-
// This implementation is adapted from FARGUIUtils.ClampToScreen
public static Rect ClampRectToScreen(Rect window, int xMargin, int yMargin)
{
- window.x = Mathf.Clamp (window.x, xMargin - window.width, Screen.width - xMargin);
- window.y = Mathf.Clamp (window.y, yMargin - window.height, Screen.height - yMargin);
+ window.x = Mathf.Clamp(window.x, xMargin - window.width, Screen.width - xMargin);
+ window.y = Mathf.Clamp(window.y, yMargin - window.height, Screen.height - yMargin);
return window;
}
@@ -713,13 +859,13 @@
public static Rect ClampRectToScreen(Rect window)
{
- return ClampRectToScreen (window, 30);
+ return ClampRectToScreen(window, 30);
}
public static Vector2 ClampV2ToScreen(Vector2 vec, uint xMargin, uint yMargin)
{
- vec.x = Mathf.Clamp (vec.x, xMargin, Screen.width - xMargin);
- vec.y = Mathf.Clamp (vec.y, yMargin, Screen.height - yMargin);
+ vec.x = Mathf.Clamp(vec.x, xMargin, Screen.width - xMargin);
+ vec.y = Mathf.Clamp(vec.y, yMargin, Screen.height - yMargin);
return vec;
}
@@ -731,24 +877,21 @@
public static Vector2 ClampV2ToScreen(Vector2 vec)
{
- return ClampV2ToScreen (vec, 15);
- }
-
+ return ClampV2ToScreen(vec, 15);
+ }
// UNDONE: This seems messy. Can we clean it up?
public static Rect DockToWindow(Rect icon, Rect window)
{
// We can't set the x and y of the center point directly, so build a new vector.
- Vector2 center = new Vector2 ();
+ Vector2 center = new Vector2();
// If we are near the top or bottom of the screen...
if (window.yMax > Screen.height - icon.height ||
- window.yMin < icon.height
- )
+ window.yMin < icon.height)
{
// If we are in a corner...
if (window.xMax > Screen.width - icon.width ||
- window.xMin < icon.width
- )
+ window.xMin < icon.width)
{
// If it is a top corner, put the icon below the window.
if (window.yMax < Screen.height / 2)
@@ -797,8 +940,7 @@
// If we are along a side...
if (window.xMax > Screen.width - icon.width ||
- window.xMin < icon.width
- )
+ window.xMin < icon.width)
{
// UNDONE: I'm not sure I like the feel of this part.
// If we are along a side towards the bottom, put the icon below the window
@@ -827,6 +969,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
@@ -32,8 +32,6 @@
///////////////////////////////////////////////////////////////////////////////
using System;
-using System.Collections.Generic;
-using System.Linq;
using UnityEngine;
using Engineer.VesselSimulator;
@@ -98,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
@@ -99,10 +99,8 @@
GUILayout.EndHorizontal();
- //}
-
//toggle for orbital info chunk
- if (GUILayout.Button("Orbital Characteristics", GUILayout.ExpandWidth(true))) toggleOrbital = !toggleOrbital;
+ if (GUILayout.Button("Orbital Characteristics", GUILayout.ExpandWidth(true))) toggleOrbital.value = !toggleOrbital;
if (toggleOrbital)
{
@@ -156,7 +154,7 @@
}
//toggle for physical info chunk
- if (GUILayout.Button("Physical Characteristics", GUILayout.ExpandWidth(true))) togglePhysical = !togglePhysical;
+ if (GUILayout.Button("Physical Characteristics", GUILayout.ExpandWidth(true))) togglePhysical.value = !togglePhysical;
if (togglePhysical)
{
@@ -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
@@ -33,15 +33,17 @@
* Static Members
* */
protected static bool _initialized = false;
+
public static bool Initialized
{
- get
- {
- return _initialized;
+ get
+ {
+ return _initialized;
}
}
protected static VOID_Core _instance;
+
public static VOID_Core Instance
{
get
@@ -63,12 +65,11 @@
}
public static double Constant_G = 6.674e-11;
-
/*
* Fields
* */
protected string VoidName = "VOID";
- protected string VoidVersion = "0.9.13";
+ protected string VoidVersion = "0.9.20";
protected bool _factoryReset = false;
@@ -80,35 +81,37 @@
[AVOID_SaveValue("mainWindowPos")]
protected VOID_SaveValue<Rect> mainWindowPos = new Rect(475, 575, 10f, 10f);
-
[AVOID_SaveValue("mainGuiMinimized")]
protected VOID_SaveValue<bool> mainGuiMinimized = false;
[AVOID_SaveValue("configWindowPos")]
protected VOID_SaveValue<Rect> configWindowPos = new Rect(825, 625, 10f, 10f);
-
[AVOID_SaveValue("configWindowMinimized")]
+
protected VOID_SaveValue<bool> configWindowMinimized = true;
-
[AVOID_SaveValue("VOIDIconPos")]
- protected VOID_SaveValue<Rect> VOIDIconPos = new Rect(Screen.width / 2 - 200, Screen.height - 30, 30f, 30f);
- protected Texture2D VOIDIconOff = new Texture2D(30, 30, TextureFormat.ARGB32, false);
- protected Texture2D VOIDIconOn = new Texture2D(30, 30, TextureFormat.ARGB32, false);
+ protected VOID_SaveValue<Rect> VOIDIconPos = new Rect(Screen.width / 2 - 200, Screen.height - 32, 32f, 32f);
+
protected Texture2D VOIDIconTexture;
- protected string VOIDIconOnPath = "VOID/Textures/void_icon_on";
- protected string VOIDIconOffPath = "VOID/Textures/void_icon_off";
+ protected string VOIDIconOnActivePath;
+ protected string VOIDIconOnInactivePath;
+ protected string VOIDIconOffActivePath;
+ protected string VOIDIconOffInactivePath;
+
protected bool VOIDIconLocked = true;
+
+ protected GUIStyle iconStyle;
protected int windowBaseID = -96518722;
protected int _windowID = 0;
protected bool GUIStylesLoaded = false;
-
protected Dictionary<string, GUIStyle> _LabelStyles = new Dictionary<string, GUIStyle>();
+
+ protected CelestialBody _Kerbin;
[AVOID_SaveValue("togglePower")]
public VOID_SaveValue<bool> togglePower = true;
-
public bool powerAvailable = true;
[AVOID_SaveValue("consumeResource")]
@@ -121,37 +124,38 @@
protected VOID_SaveValue<float> resourceRate = 0.2f;
[AVOID_SaveValue("updatePeriod")]
- protected VOID_SaveValue<double> _updatePeriod = 1001f/15000f;
+ protected VOID_SaveValue<double> _updatePeriod = 1001f / 15000f;
protected float _updateTimer = 0f;
protected string stringFrequency;
-
- // Celestial Body Housekeeping
- protected List<CelestialBody> _allBodies = new List<CelestialBody>();
- protected bool bodiesLoaded = false;
// Vessel Type Housekeeping
protected List<VesselType> _allVesselTypes = new List<VesselType>();
protected bool vesselTypesLoaded = false;
-
public float saveTimer = 0;
+ protected string defaultSkin = "KSP window 2";
[AVOID_SaveValue("defaultSkin")]
- protected VOID_SaveValue<string> defaultSkin = "KSP window 2";
- protected int _skinIdx = int.MinValue;
- protected List<GUISkin> skin_list;
+ protected VOID_SaveValue<string> _skinName;
+ protected Dictionary<string, GUISkin> skin_list;
+ protected List<string> skinNames;
protected string[] forbiddenSkins =
- {
- "PlaqueDialogSkin",
- "FlagBrowserSkin",
- "SSUITextAreaDefault",
- "ExperimentsDialogSkin",
- "ExpRecoveryDialogSkin",
- "KSP window 5",
- "KSP window 6"
- };
+ {
+ "PlaqueDialogSkin",
+ "FlagBrowserSkin",
+ "SSUITextAreaDefault",
+ "ExperimentsDialogSkin",
+ "ExpRecoveryDialogSkin",
+ "KSP window 5",
+ "KSP window 6",
+ "PartTooltipSkin"
+ };
protected bool skinsLoaded = false;
public bool configDirty;
+
+ [AVOID_SaveValue("UseBlizzyToolbar")]
+ protected VOID_SaveValue<bool> _UseToolbarManager;
+ internal IButton ToolbarButton;
/*
* Properties
@@ -176,11 +180,11 @@
{
get
{
- if (this.skin_list == null || this._skinIdx < 0 || this._skinIdx > this.skin_list.Count)
+ if (!this.skinsLoaded || this._skinName == null)
{
return AssetBase.GetGUISkin(this.defaultSkin);
}
- return this.skin_list[this._skinIdx];
+ return this.skin_list[this._skinName];
}
}
@@ -190,7 +194,7 @@
{
if (this._windowID == 0)
{
- this._windowID = this.windowBaseID;
+ this._windowID = this.windowBaseID;
}
return this._windowID++;
}
@@ -208,7 +212,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;
}
}
@@ -233,384 +253,148 @@
get
{
return this._updatePeriod;
+ }
+ }
+
+ 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
+ {
+ return _UseToolbarManager;
+ }
+ set
+ {
+ if (this._UseToolbarManager == value)
+ {
+ return;
+ }
+
+ if (value == false && this.ToolbarButton != null)
+ {
+ this.ToolbarButton.Destroy();
+ this.ToolbarButton = null;
+ }
+ if (value == true && this.ToolbarButton == null)
+ {
+ this.InitializeToolbarButton();
+ }
+
+ this.SetIconTexture(this.powerState | this.activeState);
+
+ _UseToolbarManager.value = value;
}
}
/*
* Methods
* */
- protected VOID_Core()
- {
- this._Name = "VOID Core";
-
- this._Active = true;
-
- this.VOIDIconOn = GameDatabase.Instance.GetTexture (this.VOIDIconOnPath, false);
- this.VOIDIconOff = GameDatabase.Instance.GetTexture (this.VOIDIconOffPath, 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 Preload_BeforeUpdate()
- {
- if (!this.bodiesLoaded)
- {
- this.LoadAllBodies();
- }
-
- if (!this.vesselTypesLoaded)
- {
- this.LoadVesselTypes();
- }
- }
-
- public void Update()
- {
- this.Preload_BeforeUpdate ();
-
- if (this.vessel != null)
- {
- SimManager.Instance.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
- Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
- SimManager.Instance.TryStartSimulation();
- }
-
- if (!this.guiRunning)
- {
- this.StartGUI ();
- }
-
- if (!HighLogic.LoadedSceneIsFlight && this.guiRunning)
- {
- this.StopGUI ();
- }
-
- foreach (IVOID_Module module in this.Modules)
- {
- if (!module.guiRunning && module.toggleActive)
- {
- module.StartGUI ();
- }
- if (module.guiRunning && !module.toggleActive ||
- !this.togglePower ||
- !HighLogic.LoadedSceneIsFlight ||
- this.factoryReset
- )
- {
- module.StopGUI();
- }
-
- if (module is IVOID_BehaviorModule)
- {
- ((IVOID_BehaviorModule)module).Update();
- }
- }
-
- this.CheckAndSave ();
- this._updateTimer += Time.deltaTime;
- }
-
- public void FixedUpdate()
- {
- if (this.consumeResource &&
- this.vessel.vesselType != VesselType.EVA &&
- TimeWarp.deltaTime != 0
- )
- {
- float powerReceived = this.vessel.rootPart.RequestResource(this.resourceName,
- this.resourceRate * TimeWarp.fixedDeltaTime);
- if (powerReceived > 0)
- {
- this.powerAvailable = true;
- }
- else
- {
- this.powerAvailable = false;
- }
- }
-
- foreach (IVOID_BehaviorModule module in
- this._modules.OfType<IVOID_BehaviorModule>().Where(m => !m.GetType().IsAbstract))
- {
- module.FixedUpdate();
- }
- }
-
- protected void LoadSkins()
- {
- this.skin_list = AssetBase.FindObjectsOfTypeIncludingAssets(typeof(GUISkin))
- .Where(s => !this.forbiddenSkins.Contains(s.name))
- .Select(s => s as GUISkin)
- .ToList();
-
- Tools.PostDebugMessage(string.Format(
- "{0}: loaded {1} GUISkins.",
- this.GetType().Name,
- this.skin_list.Count
- ));
-
- if (this._skinIdx == int.MinValue)
- {
- this._skinIdx = this.skin_list.IndexOf(this.Skin);
- Tools.PostDebugMessage(string.Format(
- "{0}: resetting _skinIdx to default.",
- this.GetType().Name
- ));
- }
-
- Tools.PostDebugMessage(string.Format(
- "{0}: _skinIdx = {1}.",
- this.GetType().Name,
- this._skinIdx.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.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 CheckAndSave()
- {
- this.saveTimer += Time.deltaTime;
-
- if (this.saveTimer > 2f)
- {
- Tools.PostDebugMessage (string.Format (
- "{0}: Time to save, checking if configDirty: {1}",
- this.GetType ().Name,
- this.configDirty
- ));
-
- if (!this.configDirty)
- {
- return;
- }
-
- this.SaveConfig ();
- this.saveTimer = 0;
- }
- }
-
- 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 = !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 = !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()
- {
- if (HighLogic.LoadedSceneIsFlight)
- {
- this.consumeResource = GUILayout.Toggle (this.consumeResource, "Consume Resources");
-
- this.VOIDIconLocked = GUILayout.Toggle (this.VOIDIconLocked, "Lock Icon Position");
- }
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-
- GUILayout.Label("Skin:", GUILayout.ExpandWidth(false));
-
- GUIContent _content = new GUIContent();
-
- _content.text = "◄";
- _content.tooltip = "Select previous skin";
- if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
- {
- this._skinIdx--;
- if (this._skinIdx < 0) this._skinIdx = skin_list.Count - 1;
- Tools.PostDebugMessage (string.Format (
- "{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
- this.GetType().Name,
- this._skinIdx,
- this.skin_list.Count
- ));
- }
-
- string skin_name = skin_list[this._skinIdx].name;
- _content.text = 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._skinIdx++;
- if (this._skinIdx >= skin_list.Count) this._skinIdx = 0;
- Tools.PostDebugMessage (string.Format (
- "{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
- this.GetType().Name,
- this._skinIdx,
- this.skin_list.Count
- ));
- }
-
- if (this.Skin.name != this.defaultSkin)
- {
- this.defaultSkin = this.Skin.name;
- }
-
- 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;
+
+ if (!this._modulesLoaded)
+ {
+ this.LoadModulesOfType<IVOID_Module>();
+ }
+
+ if (!this.skinsLoaded)
+ {
+ this.LoadSkins();
+ }
+
+ GUI.skin = this.Skin;
+
+ if (!this.GUIStylesLoaded)
+ {
+ this.LoadGUIStyles();
+ }
+
+ if (!this.UseToolbarManager)
+ {
+ if (GUI.Button(VOIDIconPos, VOIDIconTexture, this.iconStyle) && this.VOIDIconLocked)
+ {
+ this.ToggleMainWindow();
+ }
+ }
+ else if (this.ToolbarButton == null)
+ {
+ this.InitializeToolbarButton();
+ }
+
+ if (!this.mainGuiMinimized)
+ {
+
+ Rect _mainWindowPos = this.mainWindowPos;
+
+ _mainWindowPos = GUILayout.Window(
+ this.windowID,
+ _mainWindowPos,
+ this.VOIDMainWindow,
+ string.Join(" ", new string[] { this.VoidName, this.VoidVersion }),
+ GUILayout.Width(250),
+ GUILayout.Height(50)
+ );
+
+ _mainWindowPos = Tools.ClampRectToScreen(_mainWindowPos);
+
+ if (_mainWindowPos != this.mainWindowPos)
+ {
+ this.mainWindowPos = _mainWindowPos;
+ }
+ }
+
+ if (!this.configWindowMinimized && !this.mainGuiMinimized)
+ {
+ Rect _configWindowPos = this.configWindowPos;
+
+ _configWindowPos = GUILayout.Window(
+ this.windowID,
+ _configWindowPos,
+ this.VOIDConfigWindow,
+ string.Join(" ", new string[] { this.VoidName, "Configuration" }),
+ GUILayout.Width(250),
+ GUILayout.Height(50)
+ );
+
+ _configWindowPos = Tools.ClampRectToScreen(_configWindowPos);
+
+ if (_configWindowPos != this.configWindowPos)
+ {
+ this.configWindowPos = _configWindowPos;
+ }
+ }
}
public void OnGUI()
@@ -638,8 +422,7 @@
if (!this.VOIDIconLocked &&
VOIDIconPos.value.Contains(Event.current.mousePosition)
- && Event.current.type == EventType.mouseDrag
- )
+ && Event.current.type == EventType.mouseDrag)
{
Tools.PostDebugMessage(string.Format(
"Event.current.type: {0}" +
@@ -668,115 +451,558 @@
}
}
- public override void DrawGUI()
- {
- if (!this._modulesLoaded)
- {
- this.LoadModulesOfType<IVOID_Module> ();
- }
-
- this._windowID = this.windowBaseID;
-
- if (!this.skinsLoaded)
- {
- this.LoadSkins();
- }
-
- GUI.skin = this.Skin;
-
- if (!this.GUIStylesLoaded)
- {
- this.LoadGUIStyles ();
- }
-
- this.VOIDIconTexture = this.VOIDIconOff; //icon off default
- if (this.togglePower) this.VOIDIconTexture = this.VOIDIconOn; //or on if power_toggle==true
- if (GUI.Button(VOIDIconPos, VOIDIconTexture) && this.VOIDIconLocked)
- {
- this.mainGuiMinimized = !this.mainGuiMinimized;
- }
-
- if (!this.mainGuiMinimized)
- {
- Rect _mainWindowPos = this.mainWindowPos;
-
- _mainWindowPos = GUILayout.Window (
- this.windowID,
- _mainWindowPos,
- this.VOIDMainWindow,
- string.Join (" ", new string[] {this.VoidName, this.VoidVersion}),
- GUILayout.Width (250),
- GUILayout.Height (50)
+ public void Update()
+ {
+ this.LoadBeforeUpdate();
+
+ if (this.vessel != null)
+ {
+ SimManager.Instance.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
+ Math.Pow(VOID_Core.Instance.vessel.Radius(), 2);
+ SimManager.Instance.TryStartSimulation();
+ }
+
+ if (!this.guiRunning)
+ {
+ this.StartGUI();
+ }
+
+ if (!HighLogic.LoadedSceneIsFlight && this.guiRunning)
+ {
+ this.StopGUI();
+ }
+
+ foreach (IVOID_Module module in this.Modules)
+ {
+ if (!module.guiRunning && module.toggleActive)
+ {
+ module.StartGUI();
+ }
+ if (module.guiRunning && !module.toggleActive ||
+ !this.togglePower ||
+ !HighLogic.LoadedSceneIsFlight ||
+ this.factoryReset)
+ {
+ module.StopGUI();
+ }
+
+ if (module is IVOID_BehaviorModule)
+ {
+ ((IVOID_BehaviorModule)module).Update();
+ }
+ }
+
+ this.CheckAndSave();
+ this._updateTimer += Time.deltaTime;
+ }
+
+ public void FixedUpdate()
+ {
+ 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
);
- _mainWindowPos = Tools.ClampRectToScreen (_mainWindowPos);
-
- if (_mainWindowPos != this.mainWindowPos)
- {
- this.mainWindowPos = _mainWindowPos;
- }
- }
-
- if (!this.configWindowMinimized && !this.mainGuiMinimized)
- {
- Rect _configWindowPos = this.configWindowPos;
-
- _configWindowPos = GUILayout.Window (
- this.windowID,
- _configWindowPos,
- this.VOIDConfigWindow,
- string.Join (" ", new string[] {this.VoidName, "Configuration"}),
- GUILayout.Width (250),
- GUILayout.Height (50)
+ if (powerReceived > 0)
+ {
+ newPowerState = true;
+ }
+ else
+ {
+ newPowerState = false;
+ }
+
+ if (this.powerAvailable != newPowerState)
+ {
+ this.powerAvailable = newPowerState;
+ this.SetIconTexture(this.powerState | this.activeState);
+ }
+ }
+
+ foreach (IVOID_BehaviorModule module in
+ this._modules.OfType<IVOID_BehaviorModule>().Where(m => !m.GetType().IsAbstract))
+ {
+ module.FixedUpdate();
+ }
+ }
+
+ public void ResetGUI()
+ {
+ this.StopGUI();
+
+ foreach (IVOID_Module module in this.Modules)
+ {
+ module.StopGUI();
+ module.StartGUI();
+ }
+
+ 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()
+ {
+ 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");
+ }
+
+ 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)
);
- _configWindowPos = Tools.ClampRectToScreen (_configWindowPos);
-
- if (_configWindowPos != this.configWindowPos)
- {
- this.configWindowPos = _configWindowPos;
- }
- }
- }
-
- public void ResetGUI()
- {
- this.StopGUI ();
+ 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 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();
+ };
+ }
+
+ 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.UseToolbarManager && this.ToolbarButton != null)
+ {
+ this.ToolbarButton.TexturePath = texturePath;
+ }
+ else
+ {
+ this.VOIDIconTexture = GameDatabase.Instance.GetTexture(texturePath, false);
+ }
+ }
+
+ protected void CheckAndSave()
+ {
+ this.saveTimer += Time.deltaTime;
+
+ if (this.saveTimer > 2f)
+ {
+ if (!this.configDirty)
+ {
+ return;
+ }
+
+ Tools.PostDebugMessage(string.Format(
+ "{0}: Time to save, checking if configDirty: {1}",
+ this.GetType().Name,
+ this.configDirty
+ ));
+
+ this.SaveConfig();
+ this.saveTimer = 0;
+ }
+ }
+
+ public override void LoadConfig()
+ {
+ base.LoadConfig();
foreach (IVOID_Module module in this.Modules)
{
- module.StopGUI ();
- module.StartGUI ();
- }
-
- this.StartGUI ();
- }
-
- public override void LoadConfig()
- {
- base.LoadConfig ();
+ module.LoadConfig();
+ }
+ }
+
+ public void SaveConfig()
+ {
+ var config = KSP.IO.PluginConfiguration.CreateForType<VOID_Core>();
+ config.load();
+
+ this._SaveToConfig(config);
foreach (IVOID_Module module in this.Modules)
{
- module.LoadConfig ();
- }
- }
-
- public void SaveConfig()
- {
- var config = KSP.IO.PluginConfiguration.CreateForType<VOID_Core> ();
- config.load ();
-
- this._SaveToConfig(config);
-
- foreach (IVOID_Module module in this.Modules)
- {
- module._SaveToConfig (config);
+ module._SaveToConfig(config);
}
config.save();
this.configDirty = false;
+ }
+
+ protected VOID_Core()
+ {
+ this._Name = "VOID Core";
+
+ this._Active.value = true;
+
+ this._skinName = this.defaultSkin;
+
+ this.VOIDIconOnActivePath = "VOID/Textures/void_icon_light_glow";
+ this.VOIDIconOnInactivePath = "VOID/Textures/void_icon_dark_glow";
+ this.VOIDIconOffActivePath = "VOID/Textures/void_icon_light";
+ this.VOIDIconOffInactivePath = "VOID/Textures/void_icon_dark";
+
+ this.UseToolbarManager = false;
+
+ this.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_DataLogger.cs
+++ b/VOID_DataLogger.cs
@@ -30,19 +30,19 @@
/*
* Fields
* */
- protected bool stopwatch1_running = false;
-
- protected bool csv_logging = false;
- protected bool first_write = true;
-
- protected double stopwatch1 = 0;
-
- protected string csv_log_interval_str = "0.5";
+ protected bool stopwatch1_running;
+
+ protected bool csv_logging;
+ protected bool first_write;
+
+ protected double stopwatch1;
+
+ protected string csv_log_interval_str;
protected float csv_log_interval;
- protected double csvWriteTimer = 0;
- protected double csvCollectTimer = 0;
+ protected double csvWriteTimer;
+ protected double csvCollectTimer;
protected List<string> csvList = new List<string>();
@@ -57,6 +57,17 @@
public VOID_DataLogger()
{
this._Name = "CSV Data Logger";
+
+ this.stopwatch1_running = false;
+
+ this.csv_logging = false;
+ this.first_write = true;
+
+ this.stopwatch1 = 0;
+ this.csv_log_interval_str = "0.5";
+
+ this.csvWriteTimer = 0;
+ this.csvCollectTimer = 0;
this.WindowPos.x = Screen.width - 520;
this.WindowPos.y = 85;
--- 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)
@@ -149,7 +225,7 @@
}
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(this.Label + " (P" + digits + "):", GUILayout.ExpandWidth(true));
+ GUILayout.Label(this.Label + ":", GUILayout.ExpandWidth(true));
GUILayout.FlexibleSpace();
GUILayout.Label(this.ValueUnitString(digits), GUILayout.ExpandWidth(false));
GUILayout.EndHorizontal();
@@ -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
* */
@@ -61,6 +65,47 @@
}
}
+ 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;
+ }
+ }
+
/*
* Methods
* */
@@ -68,7 +113,7 @@
{
this._Name = "Heads-Up Display";
- this._Active = true;
+ this._Active.value = true;
this.textColors.Add(Color.green);
this.textColors.Add(Color.black);
@@ -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
@@ -24,6 +24,7 @@
using UnityEngine;
using System;
using System.Collections.Generic;
+using System.Text;
namespace VOID
{
@@ -33,9 +34,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
@@ -65,7 +77,11 @@
{
this._Name = "Heads-Up Display";
- this._Active = true;
+ this._Active.value = true;
+
+ this._colorIndex = 0;
+
+ this.textColors = new List<Color>();
this.textColors.Add(Color.green);
this.textColors.Add(Color.black);
@@ -80,57 +96,143 @@
VOID_Core.Instance.LabelStyles["hud"] = new GUIStyle();
VOID_Core.Instance.LabelStyles["hud"].normal.textColor = this.textColors [this.ColorIndex];
+ this.leftHUDdefaultPos = new Rect(Screen.width * .2083f, 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();
+
+ if (VOID_Core.Instance.powerAvailable)
+ {
+ leftHUD.AppendFormat("Obt 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("\nInc: {0}", VOID_Data.orbitInclination.ValueUnitString("F3"));
+ leftHUD.AppendFormat("\nPrimary: {0}", VOID_Data.primaryName.ValueUnitString());
+
+ GUILayout.Label(leftHUD.ToString(), VOID_Core.Instance.LabelStyles["hud"], GUILayout.ExpandWidth(true));
+ }
+ else
+ {
+ leftHUD.Append(string.Intern("-- POWER LOST --"));
+ }
+
+ if (!this.positionsLocked)
+ {
+ GUI.DragWindow();
+ }
+
+ GUI.BringWindowToBack(id);
+ }
+
+ protected void rightHUDWindow(int id)
+ {
+ StringBuilder rightHUD;
+
+ rightHUD = new StringBuilder();
+
+ if (VOID_Core.Instance.powerAvailable)
+ {
+ rightHUD.AppendFormat("Srf 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}", VOID_Data.vesselHeading.ValueUnitString());
+ rightHUD.AppendFormat("\nBiome: {0} Sit: {1}",
+ VOID_Data.currBiome.ValueUnitString(),
+ VOID_Data.expSituation.ValueUnitString()
+ );
+ }
+ else
+ {
+ 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"]);
- }
+ VOID_Core.Instance.LabelStyles["hud"].normal.textColor = textColors [ColorIndex];
+
+ this.leftHUDPos = GUI.Window(
+ VOID_Core.Instance.windowID,
+ this.leftHUDPos,
+ this.leftHUDWindow,
+ GUIContent.none,
+ GUIStyle.none
+ );
+
+ this.rightHUDPos = GUI.Window(
+ VOID_Core.Instance.windowID,
+ this.rightHUDPos,
+ this.leftHUDWindow,
+ 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 VOID_StrValue expSituation = new VOID_StrValue(
+ "Situation",
+ new Func<string> (() => VOID_Core.Instance.vessel.GetExperimentSituation().HumanString())
+ );
}
}
--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -50,7 +50,7 @@
}
set
{
- this._Active = value;
+ this._Active.value = value;
}
}
@@ -130,6 +130,8 @@
string fieldName = string.Format("{0}_{1}", this.GetType().Name, attr.Name);
+ Tools.PostDebugMessage(string.Format("{0}: Loading field {1}.", this.GetType().Name, fieldName));
+
object fieldValue = field.GetValue(this);
bool convertBack = false;
@@ -197,65 +199,45 @@
public virtual void ModuleWindow(int _)
{
- if (VOID_Core.Instance.updateTimer - this.lastUpdate > VOID_Core.Instance.updatePeriod) {
- Tools.PostDebugMessage(string.Format(
- "{0}: refreshing VOID_DataValues.",
- this.GetType().Name
- ));
-
- foreach (var fieldinfo in this.GetType().GetFields(
- BindingFlags.Instance |
- BindingFlags.NonPublic |
- BindingFlags.Public |
- BindingFlags.FlattenHierarchy
- )) {
- Tools.PostDebugMessage(string.Format(
- "{0}: checking field {1}.",
- this.GetType().Name,
- fieldinfo.Name
- ));
-
- object field = null;
-
- try
- {
- field = fieldinfo.GetValue (this);
- }
- catch (NullReferenceException) {
- Tools.PostDebugMessage(string.Format(
- "{0}: caught NullReferenceException, could not get value for field {1}.",
- this.GetType().Name,
- fieldinfo.Name
- ));
- }
-
- if (field == null) {
- continue;
- }
-
- if (typeof(IVOID_DataValue).IsAssignableFrom (field.GetType ())) {
- Tools.PostDebugMessage(string.Format(
- "{0}: found field {1}.",
- this.GetType().Name,
- fieldinfo.Name
- ));
-
- (field as IVOID_DataValue).Refresh ();
-
- Tools.PostDebugMessage(string.Format(
- "{0}: refreshed field {1}.",
- this.GetType().Name,
- fieldinfo.Name
- ));
- }
- }
-
- this.lastUpdate = VOID_Core.Instance.updateTimer;
- }
+// 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()
{
+ GUI.skin = VOID_Core.Instance.Skin;
+
Rect _Pos = this.WindowPos;
_Pos = GUILayout.Window(
--- 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 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 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 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 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 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 VOID_StrValue timeToApo = new VOID_StrValue(
+ "Time to Apoapsis",
new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
);
- protected VOID_StrValue timeToPeri = new VOID_StrValue(
- "Time to Apoapsis",
+ public static 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 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 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 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 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 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 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 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 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 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 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 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 = 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
@@ -114,7 +114,7 @@
}
}
- untoggleRegisterInfo = GUILayout.Toggle(untoggleRegisterInfo, "Hide Vessel Register Info");
+ untoggleRegisterInfo.value = GUILayout.Toggle(untoggleRegisterInfo, "Hide Vessel Register Info");
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label(" ", GUILayout.ExpandWidth(true));
@@ -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_SaveValue.cs
+++ b/VOID_SaveValue.cs
@@ -30,6 +30,28 @@
private T _value;
private Type _type;
+ private VOID_Core Core
+ {
+ get
+ {
+ if (HighLogic.LoadedSceneIsEditor)
+ {
+ if (VOID_EditorCore.Initialized)
+ {
+ return VOID_EditorCore.Instance;
+ }
+ }
+ else if (HighLogic.LoadedSceneIsFlight)
+ {
+ if (VOID_Core.Initialized)
+ {
+ return VOID_Core.Instance;
+ }
+ }
+ return null;
+ }
+ }
+
public T value
{
get
@@ -38,6 +60,20 @@
}
set
{
+ if (this.Core != null && !System.Object.Equals(this._value, value))
+ {
+ Tools.PostDebugMessage (string.Format (
+ "VOID: Dirtying config for type {0} in method {1}." +
+ "\n\t Old Value: {2}, New Value: {3}" +
+ "\n\t Object.Equals(New, Old): {4}",
+ this._type,
+ new System.Diagnostics.StackTrace().GetFrame(1).GetMethod(),
+ this._value,
+ value,
+ System.Object.Equals(this._value, value)
+ ));
+ this.Core.configDirty = true;
+ }
this._value = value;
}
}
@@ -46,6 +82,10 @@
{
get
{
+ if (this._type == null && this._value != null)
+ {
+ this._type = this._value.GetType ();
+ }
return this._type;
}
set
@@ -64,7 +104,7 @@
public void SetValue(object v)
{
- this._value = (T)v;
+ this.value = (T)v;
}
public static implicit operator T(VOID_SaveValue<T> v)
@@ -75,18 +115,8 @@
public static implicit operator VOID_SaveValue<T>(T v)
{
VOID_SaveValue<T> r = new VOID_SaveValue<T>();
+ r.type = v.GetType();
r.value = v;
- r.type = v.GetType();
-
- if (VOID_Core.Initialized)
- {
- VOID_Core.Instance.configDirty = true;
- }
-
- if (VOID_EditorCore.Initialized)
- {
- VOID_EditorCore.Instance.configDirty = true;
- }
return r;
}
--- 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 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 VOID_StrValue surfLatitude = new VOID_StrValue(
+ "Latitude",
+ new Func<string> (() => Tools.GetLatitudeString(VOID_Core.Instance.vessel))
+ );
+
+ public static VOID_StrValue surfLongitude = new VOID_StrValue(
+ "Longitude",
+ new Func<string> (() => Tools.GetLongitudeString(VOID_Core.Instance.vessel))
+ );
+
+ public static 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
+ );
+ }
+ );
+
+ public static VOID_DoubleValue terrainElevation = new VOID_DoubleValue(
+ "Terrain elevation",
+ new Func<double> (() => VOID_Core.Instance.vessel.terrainAltitude),
+ "m"
+ );
+
+ public static VOID_DoubleValue surfVelocity = new VOID_DoubleValue(
+ "Surface velocity",
+ new Func<double> (() => VOID_Core.Instance.vessel.srf_velocity.magnitude),
+ "m/s"
+ );
+
+ public static VOID_DoubleValue vertVelocity = new VOID_DoubleValue(
+ "Vertical speed",
+ new Func<double> (() => VOID_Core.Instance.vessel.verticalSpeed),
+ "m/s"
+ );
+
+ public static VOID_DoubleValue horzVelocity = new VOID_DoubleValue(
+ "Horizontal speed",
+ new Func<double> (() => VOID_Core.Instance.vessel.horizontalSrfSpeed),
+ "m/s"
+ );
+
+ public static VOID_FloatValue temperature = new VOID_FloatValue(
+ "Temperature",
+ new Func<float> (() => VOID_Core.Instance.vessel.flightIntegrator.getExternalTemperature()),
+ "°C"
+ );
+
+ public static VOID_DoubleValue atmDensity = new VOID_DoubleValue (
+ "Atmosphere Density",
+ new Func<double> (() => VOID_Core.Instance.vessel.atmDensity * 1000f),
+ "g/m³"
+ );
+
+ public static VOID_DoubleValue atmPressure = new VOID_DoubleValue (
+ "Pressure",
+ new Func<double> (() => VOID_Core.Instance.vessel.staticPressure),
+ "atm"
+ );
+
+ public static VOID_FloatValue atmLimit = new VOID_FloatValue(
+ "Atmosphere Limit",
+ new Func<float> (() => VOID_Core.Instance.vessel.mainBody.maxAtmosphereAltitude),
+ "m"
+ );
+
+ public static 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,15 +21,13 @@
using KSP;
using System;
using System.Collections.Generic;
+using System.Linq;
using UnityEngine;
namespace VOID
{
public class VOID_Transfer : VOID_WindowModule
{
- [AVOID_SaveValue("toggleExtended")]
- protected VOID_SaveValue<bool> toggleExtended = false;
-
protected List<CelestialBody> selectedBodies = new List<CelestialBody>();
public VOID_Transfer()
--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -23,33 +23,111 @@
using System.Collections.Generic;
using UnityEngine;
using Engineer.VesselSimulator;
+using Engineer.Extensions;
namespace VOID
{
public class VOID_VesselInfo : VOID_WindowModule
{
- [AVOID_SaveValue("toggleExtended")]
- protected VOID_SaveValue<bool> toggleExtended = false;
-
- 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 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 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 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 VOID_DoubleValue resourceMass = new VOID_DoubleValue(
"Resource Mass",
delegate()
{
@@ -63,20 +141,20 @@
"tons"
);
- protected VOID_DoubleValue stageDeltaV = new VOID_DoubleValue(
+ public static 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 VOID_DoubleValue totalDeltaV = new VOID_DoubleValue(
"DeltaV (Total)",
delegate()
{
@@ -87,13 +165,13 @@
"m/s"
);
- protected VOID_FloatValue mainThrottle = new VOID_FloatValue(
+ public static 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 VOID_StrValue currmaxThrust = new VOID_StrValue(
"Thrust (curr/max)",
delegate()
{
@@ -111,7 +189,7 @@
}
);
- protected VOID_StrValue currmaxThrustWeight = new VOID_StrValue(
+ public static VOID_StrValue currmaxThrustWeight = new VOID_StrValue(
"T:W (curr/max)",
delegate()
{
@@ -120,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(
@@ -136,7 +214,7 @@
}
);
- protected VOID_DoubleValue surfaceThrustWeight = new VOID_DoubleValue(
+ public static VOID_DoubleValue surfaceThrustWeight = new VOID_DoubleValue(
"Max T:W @ surface",
delegate()
{
@@ -144,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;
@@ -154,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 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);
+ }
+ );
}
}
-
--- a/VOID_VesselRegister.cs
+++ b/VOID_VesselRegister.cs
@@ -133,7 +133,7 @@
if (_selectedVessel != v)
{
_selectedVessel = v; //set clicked vessel as selected_vessel
- this._Active = true; //turn bool on to open the window if closed
+ this._Active.value = true; //turn bool on to open the window if closed
}
else
{
--- /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>