VOID_DataValue: Removed an extraneous debugging label.
--- /dev/null
+++ b/IntCollection.cs
@@ -1,1 +1,83 @@
+//
+// IntCollection.cs
+//
+// Author:
+// toadicus <>
+//
+// Copyright (c) 2013 toadicus
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+using System;
+namespace VOID
+{
+ public class IntCollection
+ {
+ public static implicit operator long(IntCollection c)
+ {
+ return c.collection;
+ }
+
+ protected long mask;
+
+ public long collection { get; protected set; }
+ public ushort maxCount { get; protected set; }
+ public ushort wordLength { get; protected set; }
+
+ public IntCollection (ushort wordLength = 4, long initialCollection = 0)
+ {
+ this.collection = initialCollection;
+ this.wordLength = wordLength;
+ this.maxCount = (ushort)((sizeof(long) * 8 - 1) / wordLength);
+ this.mask = ((1 << this.wordLength) - 1);
+ }
+
+ public ushort this[int idx]
+ {
+ get {
+ if (idx < 0) {
+ idx += this.maxCount;
+ }
+
+ if (idx >= maxCount || idx < 0) {
+ throw new IndexOutOfRangeException ();
+ }
+
+ idx *= wordLength;
+
+ return (ushort)((this.collection & (this.mask << idx)) >> idx);
+ }
+ set {
+ Console.WriteLine (value);
+ if (idx < 0) {
+ idx += this.maxCount;
+ }
+
+ if (idx >= maxCount || idx < 0) {
+ throw new IndexOutOfRangeException ();
+ }
+
+ 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
@@ -143,238 +143,247 @@
return string.Format("{0}° {1}", Math.Abs(v_lat).ToString(format), dir_lat);
}
- ///////////////////////////////////////////////////////////////////////////////
-
- //For MuMech_get_heading()
- public class MuMech_MovingAverage
- {
- private double[] store;
- private int storeSize;
- private int nextIndex = 0;
-
- public double value
- {
- get
- {
- double tmp = 0;
- foreach (double i in store)
- {
- tmp += i;
- }
- return tmp / storeSize;
- }
- set
- {
- store[nextIndex] = value;
- nextIndex = (nextIndex + 1) % storeSize;
- }
- }
-
- public MuMech_MovingAverage(int size = 10, double startingValue = 0)
- {
- storeSize = size;
- store = new double[size];
- force(startingValue);
- }
-
- public void force(double newValue)
- {
- for (int i = 0; i < storeSize; i++)
- {
- store[i] = newValue;
- }
- }
-
- public static implicit operator double(MuMech_MovingAverage v)
- {
- return v.value;
- }
-
- public override string ToString()
- {
- return value.ToString();
- }
-
- public string ToString(string format)
- {
- return value.ToString(format);
- }
- }
-
- //From http://svn.mumech.com/KSP/trunk/MuMechLib/VOID.vesselState.cs
- public static double MuMech_get_heading(Vessel vessel)
- {
- Vector3d CoM = vessel.findWorldCenterOfMass();
- Vector3d up = (CoM - vessel.mainBody.position).normalized;
- Vector3d north = Vector3d.Exclude(up, (vessel.mainBody.position + vessel.mainBody.transform.up * (float)vessel.mainBody.Radius) - CoM).normalized;
-
- Quaternion rotationSurface = Quaternion.LookRotation(north, up);
- Quaternion rotationvesselSurface = Quaternion.Inverse(Quaternion.Euler(90, 0, 0) * Quaternion.Inverse(vessel.transform.rotation) * rotationSurface);
- MuMech_MovingAverage vesselHeading = new MuMech_MovingAverage();
- vesselHeading.value = rotationvesselSurface.eulerAngles.y;
- return vesselHeading.value * 10; // *10 by me
- }
-
- //From http://svn.mumech.com/KSP/trunk/MuMechLib/MuUtils.cs
- public static string MuMech_ToSI(double d)
- {
- int digits = 2;
- double exponent = Math.Log10(Math.Abs(d));
- if (Math.Abs(d) >= 1)
- {
- 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";
- }
- }
- else if (Math.Abs(d) > 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";
- }
- }
- else
- {
- return "0";
- }
- }
-
- public static string ConvertInterval(double seconds)
- {
- string format_1 = "{0:D1}y {1:D1}d {2:D2}h {3:D2}m {4:D2}.{5:D1}s";
- string format_2 = "{0:D1}d {1:D2}h {2:D2}m {3:D2}.{4:D1}s";
- string format_3 = "{0:D2}h {1:D2}m {2:D2}.{3:D1}s";
+ ///////////////////////////////////////////////////////////////////////////////
+
+ //For MuMech_get_heading()
+ public class MuMech_MovingAverage
+ {
+ private double[] store;
+ private int storeSize;
+ private int nextIndex = 0;
+
+ public double value
+ {
+ get
+ {
+ double tmp = 0;
+ foreach (double i in store)
+ {
+ tmp += i;
+ }
+ return tmp / storeSize;
+ }
+ set
+ {
+ store[nextIndex] = value;
+ nextIndex = (nextIndex + 1) % storeSize;
+ }
+ }
+
+ public MuMech_MovingAverage(int size = 10, double startingValue = 0)
+ {
+ storeSize = size;
+ store = new double[size];
+ force(startingValue);
+ }
+
+ public void force(double newValue)
+ {
+ for (int i = 0; i < storeSize; i++)
+ {
+ store[i] = newValue;
+ }
+ }
+
+ public static implicit operator double(MuMech_MovingAverage v)
+ {
+ return v.value;
+ }
+
+ public override string ToString()
+ {
+ return value.ToString();
+ }
+
+ public string ToString(string format)
+ {
+ return value.ToString(format);
+ }
+ }
+
+ //From http://svn.mumech.com/KSP/trunk/MuMechLib/VOID.vesselState.cs
+ public static double MuMech_get_heading(Vessel vessel)
+ {
+ Vector3d CoM = vessel.findWorldCenterOfMass();
+ Vector3d up = (CoM - vessel.mainBody.position).normalized;
+ Vector3d north = Vector3d.Exclude(
+ up,
+ (vessel.mainBody.position +
+ vessel.mainBody.transform.up * (float)vessel.mainBody.Radius
+ ) - CoM).normalized;
+
+ Quaternion rotationSurface = Quaternion.LookRotation(north, up);
+ Quaternion rotationvesselSurface = Quaternion.Inverse(
+ Quaternion.Euler(90, 0, 0) *
+ Quaternion.Inverse(vessel.transform.rotation) *
+ rotationSurface);
+
+ return rotationvesselSurface.eulerAngles.y;
+ }
+
+ //From http://svn.mumech.com/KSP/trunk/MuMechLib/MuUtils.cs
+ public static string MuMech_ToSI(
+ double d, int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue
+ )
+ {
+ float exponent = (float)Math.Log10(Math.Abs(d));
+ exponent = Mathf.Clamp(exponent, (float)MinMagnitude, (float)MaxMagnitude);
+
+ if (exponent >= 0)
+ {
+ 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";
+ }
+ }
+ 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";
+ }
+ }
+ else
+ {
+ return "0";
+ }
+ }
+
+ public static string ConvertInterval(double seconds)
+ {
+ string format_1 = "{0:D1}y {1:D1}d {2:D2}h {3:D2}m {4:D2}.{5:D1}s";
+ string format_2 = "{0:D1}d {1:D2}h {2:D2}m {3:D2}.{4:D1}s";
+ string format_3 = "{0:D2}h {1:D2}m {2:D2}.{3:D1}s";
TimeSpan interval;
try
{
- interval = TimeSpan.FromSeconds(seconds);
+ interval = TimeSpan.FromSeconds(seconds);
}
catch (OverflowException)
{
return "NaN";
}
- int years = interval.Days / 365;
-
- string output;
- if (years > 0)
- {
- output = string.Format(format_1,
- years,
- interval.Days - (years * 365), // subtract years * 365 for accurate day count
- interval.Hours,
- interval.Minutes,
- interval.Seconds,
- interval.Milliseconds.ToString().Substring(0, 1));
- }
- else if (interval.Days > 0)
- {
- output = string.Format(format_2,
- interval.Days,
- interval.Hours,
- interval.Minutes,
- interval.Seconds,
- interval.Milliseconds.ToString().Substring(0, 1));
- }
- else
- {
- output = string.Format(format_3,
- interval.Hours,
- interval.Minutes,
- interval.Seconds,
- interval.Milliseconds.ToString().Substring(0, 1));
- }
- return output;
- }
-
- public static string UppercaseFirst(string s)
- {
- if (string.IsNullOrEmpty(s))
- {
- return string.Empty;
- }
- char[] a = s.ToCharArray();
- 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));
- double T_transfer = (2 * Math.PI) * Math.Sqrt(Math.Pow((((r_target / 1000) + (r_current / 1000)) / 2), 3) / (grav_param / 1000000000));
- return 360 * (0.5 - (T_transfer / (2 * T_target)));
- }
-
- public static double Younata_DeltaVToGetToOtherBody(double mu, double r1, double r2)
- {
- /*
+ int years = interval.Days / 365;
+
+ string output;
+ if (years > 0)
+ {
+ output = string.Format(format_1,
+ years,
+ interval.Days - (years * 365), // subtract years * 365 for accurate day count
+ interval.Hours,
+ interval.Minutes,
+ interval.Seconds,
+ interval.Milliseconds.ToString().Substring(0, 1));
+ }
+ else if (interval.Days > 0)
+ {
+ output = string.Format(format_2,
+ interval.Days,
+ interval.Hours,
+ interval.Minutes,
+ interval.Seconds,
+ interval.Milliseconds.ToString().Substring(0, 1));
+ }
+ else
+ {
+ output = string.Format(format_3,
+ interval.Hours,
+ interval.Minutes,
+ interval.Seconds,
+ interval.Milliseconds.ToString().Substring(0, 1));
+ }
+ return output;
+ }
+
+ public static string UppercaseFirst(string s)
+ {
+ if (string.IsNullOrEmpty(s))
+ {
+ return string.Empty;
+ }
+ char[] a = s.ToCharArray();
+ 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));
+ double T_transfer = (2 * Math.PI) * Math.Sqrt(Math.Pow((((r_target / 1000) + (r_current / 1000)) / 2), 3) / (grav_param / 1000000000));
+ return 360 * (0.5 - (T_transfer / (2 * T_target)));
+ }
+
+ public static double Younata_DeltaVToGetToOtherBody(double mu, double r1, double r2)
+ {
+ /*
def deltaVToGetToOtherBody(mu, r1, r2):
# mu = gravity param of common orbiting body of r1 and r2
# (e.g. for mun to minmus, mu is kerbin's gravity param
@@ -387,16 +396,16 @@
mult = sr1r2 - 1
return sur1 * mult
*/
- double sur1, sr1r2, mult;
- sur1 = Math.Sqrt(mu / r1);
- sr1r2 = Math.Sqrt((2 * r2) / (r1 + r2));
- mult = sr1r2 - 1;
- return sur1 * mult;
- }
-
- public static double Younata_DeltaVToExitSOI(double mu, double r1, double r2, double v)
- {
- /*
+ double sur1, sr1r2, mult;
+ sur1 = Math.Sqrt(mu / r1);
+ sr1r2 = Math.Sqrt((2 * r2) / (r1 + r2));
+ mult = sr1r2 - 1;
+ return sur1 * mult;
+ }
+
+ public static double Younata_DeltaVToExitSOI(double mu, double r1, double r2, double v)
+ {
+ /*
def deltaVToExitSOI(mu, r1, r2, v):
# mu = gravity param of current body
# r1 = current orbit radius
@@ -407,15 +416,15 @@
r = r1*r2
return math.sqrt(bar / r)
*/
- double foo = r2 * Math.Pow(v, 2) - 2 * mu;
- double bar = r1 * foo + (2 * r2 * mu);
- double r = r1 * r2;
- return Math.Sqrt(bar / r);
- }
-
- public static double Younata_TransferBurnPoint(double r, double v, double angle, double mu)
- {
- /*
+ double foo = r2 * Math.Pow(v, 2) - 2 * mu;
+ double bar = r1 * foo + (2 * r2 * mu);
+ double r = r1 * r2;
+ return Math.Sqrt(bar / r);
+ }
+
+ public static double Younata_TransferBurnPoint(double r, double v, double angle, double mu)
+ {
+ /*
def transferBurnPoint(r, v, angle, mu):
# r = parking orbit radius
# v = ejection velocity
@@ -428,65 +437,65 @@
degrees = theta * (180.0 / math.pi)
return 180 - degrees
*/
- double epsilon, h, ee, theta, degrees;
- epsilon = (Math.Pow(v, 2) / 2) - (mu / r);
- h = r * v * Math.Sin(angle);
- ee = Math.Sqrt(1 + ((2 * epsilon * Math.Pow(h, 2)) / Math.Pow(mu, 2)));
- theta = Math.Acos(1.0 / ee);
- degrees = theta * (180.0 / Math.PI);
- return 180 - degrees;
- // returns the ejection angle
- }
-
- 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;
- angle = angle * 360;
- return angle;
- }
-
- 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;
- return eangle;
- }
-
- public static double mrenigma03_calcphase(Vessel vessel, CelestialBody target) //calculates phase angle between the current body and target body
- {
- Vector3d vecthis = new Vector3d();
- Vector3d vectarget = new Vector3d();
- vectarget = target.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
-
- if ((vessel.mainBody.name == "Sun") || (vessel.mainBody.referenceBody.referenceBody.name == "Sun"))
- {
- vecthis = vessel.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
- }
- else
- {
- vecthis = vessel.mainBody.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
- }
-
- vecthis = Vector3d.Project(new Vector3d(vecthis.x, 0, vecthis.z), vecthis);
- vectarget = Vector3d.Project(new Vector3d(vectarget.x, 0, vectarget.z), vectarget);
-
- Vector3d prograde = new Vector3d();
- prograde = Quaternion.AngleAxis(90, Vector3d.forward) * vecthis;
-
- double phase = Vector3d.Angle(vecthis, vectarget);
-
- if (Vector3d.Angle(prograde, vectarget) > 90) phase = 360 - phase;
-
- return (phase + 360) % 360;
- }
+ double epsilon, h, ee, theta, degrees;
+ epsilon = (Math.Pow(v, 2) / 2) - (mu / r);
+ h = r * v * Math.Sin(angle);
+ ee = Math.Sqrt(1 + ((2 * epsilon * Math.Pow(h, 2)) / Math.Pow(mu, 2)));
+ theta = Math.Acos(1.0 / ee);
+ degrees = theta * (180.0 / Math.PI);
+ return 180 - degrees;
+ // returns the ejection angle
+ }
+
+ 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;
+ angle = angle * 360;
+ return angle;
+ }
+
+ 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;
+ return eangle;
+ }
+
+ public static double mrenigma03_calcphase(Vessel vessel, CelestialBody target) //calculates phase angle between the current body and target body
+ {
+ Vector3d vecthis = new Vector3d();
+ Vector3d vectarget = new Vector3d();
+ vectarget = target.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
+
+ if ((vessel.mainBody.name == "Sun") || (vessel.mainBody.referenceBody.referenceBody.name == "Sun"))
+ {
+ vecthis = vessel.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
+ }
+ else
+ {
+ vecthis = vessel.mainBody.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
+ }
+
+ vecthis = Vector3d.Project(new Vector3d(vecthis.x, 0, vecthis.z), vecthis);
+ vectarget = Vector3d.Project(new Vector3d(vectarget.x, 0, vectarget.z), vectarget);
+
+ Vector3d prograde = new Vector3d();
+ prograde = Quaternion.AngleAxis(90, Vector3d.forward) * vecthis;
+
+ double phase = Vector3d.Angle(vecthis, vectarget);
+
+ if (Vector3d.Angle(prograde, vectarget) > 90) phase = 360 - phase;
+
+ return (phase + 360) % 360;
+ }
public static double FixAngleDomain(double Angle, bool Degrees = false)
{
@@ -509,55 +518,56 @@
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;
- }
- else if (transfer_angle > 0)
- {
- if (curr_phase > 0) return curr_phase;
- else if (curr_phase < 0) return (360 + curr_phase);
- }
- return curr_phase;
- }
-
- public static double adjust_current_ejection_angle(double curr_ejection)
- {
- //curr_ejection WILL need to be adjusted once for all transfers as it returns values ranging -180 to 180
- // need 0-360 instead
- //
- // ie i have -17 in the screenshot
- // need it to show 343
- //
- // do this
- //
- // 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;
-
- }
-
- public static double adjust_transfer_ejection_angle(double trans_ejection, double trans_phase)
- {
- // if transfer_phase_angle < 0 its a lower transfer
- //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;
-
- }
-
- public static double TrueAltitude(Vessel vessel)
+ 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;
+ }
+ else if (transfer_angle > 0)
+ {
+ if (curr_phase > 0) return curr_phase;
+ else if (curr_phase < 0) return (360 + curr_phase);
+ }
+ return curr_phase;
+ }
+
+ public static double adjust_current_ejection_angle(double curr_ejection)
+ {
+ //curr_ejection WILL need to be adjusted once for all transfers as it returns values ranging -180 to 180
+ // need 0-360 instead
+ //
+ // ie i have -17 in the screenshot
+ // need it to show 343
+ //
+ // do this
+ //
+ // 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;
+
+ }
+
+ public static double adjust_transfer_ejection_angle(double trans_ejection, double trans_phase)
+ {
+ // if transfer_phase_angle < 0 its a lower transfer
+ //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;
+
+ }
+
+ public static double TrueAltitude(Vessel vessel)
{
double trueAltitude = vessel.orbit.altitude - 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.
+ // 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 )
{
trueAltitude = vessel.orbit.altitude;
@@ -587,7 +597,7 @@
else return "";
}
-
+
public static void display_transfer_angles_SUN2PLANET(CelestialBody body, Vessel vessel)
{
@@ -732,13 +742,13 @@
// 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)
@@ -787,8 +797,8 @@
// 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
@@ -816,7 +826,7 @@
// Return the icon's position.
return icon;
}
-
+
private static ScreenMessage debugmsg = new ScreenMessage("", 2f, ScreenMessageStyle.UPPER_RIGHT);
[System.Diagnostics.Conditional("DEBUG")]
--- a/VOID.csproj
+++ /dev/null
@@ -1,92 +1,1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
- <ProductVersion>10.0.0</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{45ACC1CC-942C-4A66-BFC7-8BE375938B18}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>VOID</RootNamespace>
- <AssemblyName>VOID</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug</OutputPath>
- <DefineConstants>DEBUG; TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CustomCommands>
- <CustomCommands>
- <Command type="AfterBuild" command="xcopy /Y ${ProjectDir}\bin\Debug\*.dll ..\..\..\Games\KSP_win\GameData\VOID\Plugins\" workingdir="${ProjectDir}" externalConsole="True" />
- </CustomCommands>
- </CustomCommands>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <Optimize>true</Optimize>
- <OutputPath>bin\Release</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <DefineConstants>TRACE</DefineConstants>
- <CustomCommands>
- <CustomCommands>
- <Command type="AfterBuild" command="xcopy /Y ${ProjectDir}\bin\Release\*.dll ..\..\..\Games\KSP_win\GameData\VOID\Plugins\" workingdir="${ProjectDir}" externalConsole="True" />
- </CustomCommands>
- </CustomCommands>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="Tools.cs" />
- <Compile Include="IVOID_Module.cs" />
- <Compile Include="VOIDFlightMaster.cs" />
- <Compile Include="VOID_Core.cs" />
- <Compile Include="VOID_Module.cs" />
- <Compile Include="VOID_HUD.cs" />
- <Compile Include="VOID_SaveValue.cs" />
- <Compile Include="VOID_Orbital.cs" />
- <Compile Include="VOID_SurfAtmo.cs" />
- <Compile Include="VOID_VesselInfo.cs" />
- <Compile Include="VOID_Transfer.cs" />
- <Compile Include="VOID_CBInfoBrowser.cs" />
- <Compile Include="VOID_Rendezvous.cs" />
- <Compile Include="VOID_VesselRegister.cs" />
- <Compile Include="VOID_DataLogger.cs" />
- <Compile Include="VOID_EditorCore.cs" />
- <Compile Include="VOID_EditorHUD.cs" />
- </ItemGroup>
- <ItemGroup>
- <Reference Include="Assembly-CSharp">
- <HintPath>..\..\..\Games\KSP_win\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
- </Reference>
- <Reference Include="UnityEngine">
- <HintPath>..\..\..\Games\KSP_win\KSP_Data\Managed\UnityEngine.dll</HintPath>
- </Reference>
- <Reference Include="System">
- <HintPath>..\..\..\Games\KSP_win\KSP_Data\Managed\System.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Engineer.Extensions\Engineer.Extensions.csproj">
- <Project>{2FCF882B-0771-4649-8D04-81D7AA76A486}</Project>
- <Name>Engineer.Extensions</Name>
- </ProjectReference>
- <ProjectReference Include="..\VesselSimulator\VesselSimulator.csproj">
- <Project>{30FD6C0B-D36E-462F-B0FF-F0FAC9C666CF}</Project>
- <Name>VesselSimulator</Name>
- </ProjectReference>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <Policies>
- <StandardHeader Text=" 
 ${FileName}
 
 Author:
 ${AuthorName} <${AuthorEmail}>

 Copyright (c) ${Year} ${CopyrightHolder}

 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/>." IncludeInNewFiles="True" />
- </Policies>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
-</Project>
+
--- a/VOIDFlightMaster.cs
+++ b/VOIDFlightMaster.cs
@@ -49,6 +49,7 @@
Tools.PostDebugMessage ("VOIDFlightMaster: Waking up.");
this.Core = (VOID_Core)VOID_Core.Instance;
this.Core.ResetGUI ();
+ SimManager.HardReset();
Tools.PostDebugMessage ("VOIDFlightMaster: Awake.");
}
@@ -68,13 +69,6 @@
}
this.Core.Update ();
-
- if (this.Core.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.Core.factoryReset)
{
@@ -115,6 +109,7 @@
Tools.PostDebugMessage ("VOIDEditorMaster: Waking up.");
this.Core = VOID_EditorCore.Instance;
this.Core.ResetGUI ();
+ SimManager.HardReset();
Tools.PostDebugMessage ("VOIDEditorMaster: Awake.");
}
--- a/VOID_CBInfoBrowser.cs
+++ b/VOID_CBInfoBrowser.cs
@@ -102,7 +102,7 @@
//}
//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 +156,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)
{
@@ -207,89 +207,89 @@
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["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label((body.orbit.ApA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(Tools.ConvertInterval(body.orbit.timeToAp), VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label((body.orbit.PeA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(Tools.ConvertInterval(body.orbit.timeToPe), VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label((body.orbit.semiMajorAxis / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(body.orbit.eccentricity.ToString("F4") + "", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(Tools.ConvertInterval(body.orbit.period), VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(Tools.ConvertInterval(body.rotationPeriod), VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label((body.orbit.orbitalSpeed / 1000).ToString("F2") + "km/s", VOID_Core.Instance.LabelStyles["txt_right"], 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["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label((body.orbit.meanAnomaly * 180d / Math.PI).ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(body.orbit.trueAnomaly.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ 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["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label((body.orbit.eccentricAnomaly * 180d / Math.PI).ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(body.orbit.inclination.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(body.orbit.LAN.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(body.orbit.argumentOfPeriapsis.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ 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
{
string body_tidally_locked = "No";
if (body.tidallyLocked) body_tidally_locked = "Yes";
- GUILayout.Label(body_tidally_locked, VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ GUILayout.Label(body_tidally_locked, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
}
//GUILayout.EndHorizontal();
}
@@ -297,35 +297,35 @@
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["txt_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["txt_right"], 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["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.Label(((4 / 3) * Math.PI * Math.Pow((vessel.mainBody.Radius / 1000), 3)).ToString(), txt_right, GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(body.Mass.ToString("0.00e+00") + "kg", VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ 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["txt_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["txt_right"], GUILayout.ExpandWidth(true));
- else GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(body.orbitingBodies.Count.ToString(), VOID_Core.Instance.LabelStyles["txt_right"], 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
@@ -336,28 +336,28 @@
}
//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(num_art_sats.ToString(), VOID_Core.Instance.LabelStyles["txt_right"], 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["txt_right"], GUILayout.ExpandWidth(true));
- //GUILayout.EndHorizontal();
-
- //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("≈ " + Tools.MuMech_ToSI(body.maxAtmosphereAltitude) + "m", VOID_Core.Instance.LabelStyles["txt_right"], 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["txt_right"], GUILayout.ExpandWidth(true));
+ GUILayout.Label(O2, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
//GUILayout.EndHorizontal();
//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
string ocean = "No";
if (body.ocean == true) ocean = "Yes";
- GUILayout.Label(ocean, VOID_Core.Instance.LabelStyles["txt_right"], GUILayout.ExpandWidth(true));
+ GUILayout.Label(ocean, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
//GUILayout.EndHorizontal();
}
}
--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -21,9 +21,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Reflection;
using KSP;
using UnityEngine;
+using Engineer.VesselSimulator;
namespace VOID
{
@@ -68,7 +68,7 @@
* Fields
* */
protected string VoidName = "VOID";
- protected string VoidVersion = "0.9.10";
+ protected string VoidVersion = "0.9.15";
protected bool _factoryReset = false;
@@ -120,6 +120,11 @@
[AVOID_SaveValue("resourceRate")]
protected VOID_SaveValue<float> resourceRate = 0.2f;
+ [AVOID_SaveValue("updatePeriod")]
+ protected VOID_SaveValue<double> _updatePeriod = 1001f/15000f;
+ protected float _updateTimer = 0f;
+ protected string stringFrequency;
+
// Celestial Body Housekeeping
protected List<CelestialBody> _allBodies = new List<CelestialBody>();
protected bool bodiesLoaded = false;
@@ -130,10 +135,12 @@
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",
@@ -171,11 +178,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];
}
}
@@ -212,6 +219,22 @@
get
{
return this._allVesselTypes;
+ }
+ }
+
+ public float updateTimer
+ {
+ get
+ {
+ return this._updateTimer;
+ }
+ }
+
+ public double updatePeriod
+ {
+ get
+ {
+ return this._updatePeriod;
}
}
@@ -222,10 +245,12 @@
{
this._Name = "VOID Core";
- this._Active = true;
+ this._Active.value = true;
this.VOIDIconOn = GameDatabase.Instance.GetTexture (this.VOIDIconOnPath, false);
this.VOIDIconOff = GameDatabase.Instance.GetTexture (this.VOIDIconOffPath, false);
+
+ this._skinName = this.defaultSkin;
this.LoadConfig ();
}
@@ -312,6 +337,13 @@
{
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 ();
@@ -330,8 +362,8 @@
}
if (module.guiRunning && !module.toggleActive ||
!this.togglePower ||
- !HighLogic.LoadedSceneIsFlight
- || this.factoryReset
+ !HighLogic.LoadedSceneIsFlight ||
+ this.factoryReset
)
{
module.StopGUI();
@@ -344,6 +376,7 @@
}
this.CheckAndSave ();
+ this._updateTimer += Time.deltaTime;
}
public void FixedUpdate()
@@ -374,10 +407,20 @@
protected void LoadSkins()
{
+ Tools.PostDebugMessage ("AssetBase has skins: \n" +
+ string.Join("\n\t", AssetBase.FindObjectsOfTypeIncludingAssets (
+ typeof(GUISkin))
+ .Select(s => s.ToString())
+ .ToArray()
+ )
+ );
+
this.skin_list = AssetBase.FindObjectsOfTypeIncludingAssets(typeof(GUISkin))
.Where(s => !this.forbiddenSkins.Contains(s.name))
.Select(s => s as GUISkin)
- .ToList();
+ .GroupBy(s => s.name)
+ .Select(g => g.First())
+ .ToDictionary(s => s.name);
Tools.PostDebugMessage(string.Format(
"{0}: loaded {1} GUISkins.",
@@ -385,9 +428,12 @@
this.skin_list.Count
));
- if (this._skinIdx == int.MinValue)
- {
- this._skinIdx = this.skin_list.IndexOf(this.Skin);
+ 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
@@ -397,7 +443,7 @@
Tools.PostDebugMessage(string.Format(
"{0}: _skinIdx = {1}.",
this.GetType().Name,
- this._skinIdx.ToString()
+ this._skinName.ToString()
));
this.skinsLoaded = true;
@@ -405,6 +451,9 @@
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;
@@ -414,9 +463,13 @@
this.LabelStyles["center_bold"].alignment = TextAnchor.UpperCenter;
this.LabelStyles["center_bold"].fontStyle = FontStyle.Bold;
- this.LabelStyles["txt_right"] = new GUIStyle(GUI.skin.label);
- this.LabelStyles["txt_right"].normal.textColor = Color.white;
- this.LabelStyles["txt_right"].alignment = TextAnchor.UpperRight;
+ 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;
}
@@ -437,12 +490,6 @@
protected void CheckAndSave()
{
this.saveTimer += Time.deltaTime;
-
- Tools.PostDebugMessage (string.Format (
- "{0}: Checking if time to save; saveTimer: {1}",
- this.GetType ().Name,
- this.saveTimer
- ));
if (this.saveTimer > 2f)
{
@@ -472,7 +519,7 @@
{
string str = "ON";
if (togglePower) str = "OFF";
- if (GUILayout.Button("Power " + str)) togglePower = !togglePower;
+ if (GUILayout.Button("Power " + str)) togglePower.value = !togglePower;
}
if (togglePower || HighLogic.LoadedSceneIsEditor)
@@ -485,13 +532,10 @@
}
else
{
- GUIStyle label_txt_red = new GUIStyle(GUI.skin.label);
- label_txt_red.normal.textColor = Color.red;
- label_txt_red.alignment = TextAnchor.MiddleCenter;
- GUILayout.Label("-- POWER LOST --", label_txt_red);
- }
-
- this.configWindowMinimized = !GUILayout.Toggle (!this.configWindowMinimized, "Configuration");
+ GUILayout.Label("-- POWER LOST --", this.LabelStyles["red"]);
+ }
+
+ this.configWindowMinimized.value = !GUILayout.Toggle (!this.configWindowMinimized, "Configuration");
GUILayout.EndVertical();
GUI.DragWindow();
@@ -509,9 +553,13 @@
public override void DrawConfigurables()
{
+ int skinIdx;
+
+ GUIContent _content;
+
if (HighLogic.LoadedSceneIsFlight)
{
- this.consumeResource = GUILayout.Toggle (this.consumeResource, "Consume Resources");
+ this.consumeResource.value = GUILayout.Toggle (this.consumeResource, "Consume Resources");
this.VOIDIconLocked = GUILayout.Toggle (this.VOIDIconLocked, "Lock Icon Position");
}
@@ -520,24 +568,36 @@
GUILayout.Label("Skin:", GUILayout.ExpandWidth(false));
- GUIContent _content = new GUIContent();
+ _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._skinIdx--;
- if (this._skinIdx < 0) this._skinIdx = skin_list.Count - 1;
+ 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._skinIdx,
+ this._skinName,
this.skin_list.Count
));
}
- string skin_name = skin_list[this._skinIdx].name;
- _content.text = skin_name;
+ _content.text = this.Skin.name;
_content.tooltip = "Current skin";
GUILayout.Label(_content, this.LabelStyles["center"], GUILayout.ExpandWidth(true));
@@ -545,23 +605,39 @@
_content.tooltip = "Select next skin";
if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
{
- this._skinIdx++;
- if (this._skinIdx >= skin_list.Count) this._skinIdx = 0;
+ skinIdx++;
+ if (skinIdx >= skinNames.Count) skinIdx = 0;
Tools.PostDebugMessage (string.Format (
"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
this.GetType().Name,
- this._skinIdx,
+ this._skinName,
this.skin_list.Count
));
}
- if (this.Skin.name != this.defaultSkin)
- {
- this.defaultSkin = this.Skin.name;
+ 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 ();
@@ -577,6 +653,7 @@
return;
}
+ /*
Tools.PostDebugMessage(string.Format(
"Event.current.type: {0}" +
"\nthis.VOIDIconLocked: {1}" +
@@ -590,6 +667,7 @@
this.VOIDIconPos.value.xMax,
this.VOIDIconPos.value.yMax
));
+ */
if (!this.VOIDIconLocked &&
VOIDIconPos.value.Contains(Event.current.mousePosition)
@@ -648,7 +726,7 @@
if (this.togglePower) this.VOIDIconTexture = this.VOIDIconOn; //or on if power_toggle==true
if (GUI.Button(VOIDIconPos, VOIDIconTexture, new GUIStyle()) && this.VOIDIconLocked)
{
- this.mainGuiMinimized = !this.mainGuiMinimized;
+ this.mainGuiMinimized.value = !this.mainGuiMinimized;
}
if (!this.mainGuiMinimized)
@@ -672,7 +750,7 @@
}
}
- if (!this.configWindowMinimized)
+ if (!this.configWindowMinimized && !this.mainGuiMinimized)
{
Rect _configWindowPos = this.configWindowPos;
--- 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;
--- /dev/null
+++ b/VOID_DataValue.cs
@@ -1,1 +1,305 @@
-
+//
+// VOID_DataValue.cs
+//
+// Author:
+// toadicus <>
+//
+// Copyright (c) 2013 toadicus
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+using System;
+using UnityEngine;
+
+namespace VOID
+{
+ public interface IVOID_DataValue
+ {
+ void Refresh();
+ string ValueUnitString();
+ void DoGUIHorizontal();
+ }
+
+ public class VOID_DataValue<T> : IVOID_DataValue
+ {
+ /*
+ * Static Members
+ * */
+ public static implicit operator T(VOID_DataValue<T> v)
+ {
+ return (T)v.Value;
+ }
+
+ /*
+ * Instance Members
+ * */
+ /*
+ * Fields
+ * */
+ protected T cache;
+ protected Func<T> ValueFunc;
+
+ /*
+ * Properties
+ * */
+ public string Label { get; protected set; }
+ public string Units { get; protected set; }
+
+ public T Value {
+ get {
+ return (T)this.cache;
+ }
+ }
+
+ /*
+ * Methods
+ * */
+ public VOID_DataValue(string Label, Func<T> ValueFunc, string Units = "")
+ {
+ this.Label = Label;
+ this.Units = Units;
+ this.ValueFunc = ValueFunc;
+ }
+
+ public void Refresh()
+ {
+ this.cache = this.ValueFunc.Invoke ();
+ }
+
+ public T GetFreshValue()
+ {
+ this.Refresh ();
+ return (T)this.cache;
+ }
+
+ public string ValueUnitString() {
+ return this.Value.ToString() + this.Units;
+ }
+
+ public virtual void DoGUIHorizontal()
+ {
+ GUILayout.BeginHorizontal (GUILayout.ExpandWidth (true));
+ GUILayout.Label (this.Label + ":");
+ GUILayout.FlexibleSpace ();
+ GUILayout.Label (this.ValueUnitString(), GUILayout.ExpandWidth (false));
+ GUILayout.EndHorizontal ();
+ }
+
+ public override string ToString()
+ {
+ return string.Format (
+ "{0}: {1}{2}",
+ this.Label,
+ this.Value.ToString (),
+ this.Units
+ );
+ }
+ }
+
+ 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 virtual string ValueUnitString(int digits) {
+ return Tools.MuMech_ToSI(this.ToDouble(), digits) + this.Units;
+ }
+
+ public virtual string ValueUnitString(int digits, int MinMagnitude, int MaxMagnitude)
+ {
+ return Tools.MuMech_ToSI(this.ToDouble(), digits, MinMagnitude, MaxMagnitude) + this.Units;
+ }
+
+ public virtual void DoGUIHorizontal(string format)
+ {
+ GUILayout.BeginHorizontal (GUILayout.ExpandWidth (true));
+ GUILayout.Label (this.Label + ":");
+ GUILayout.FlexibleSpace ();
+ GUILayout.Label (this.ValueUnitString(format), GUILayout.ExpandWidth (false));
+ GUILayout.EndHorizontal ();
+ }
+
+ public virtual int DoGUIHorizontal(int digits, bool precisionButton = true)
+ {
+ if (precisionButton)
+ {
+ return this.DoGUIHorizontalPrec(digits);
+ }
+
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(this.Label + ":", GUILayout.ExpandWidth(true));
+ GUILayout.FlexibleSpace();
+ GUILayout.Label(this.ValueUnitString(digits), GUILayout.ExpandWidth(false));
+ GUILayout.EndHorizontal();
+
+ return digits;
+ }
+
+ public virtual int DoGUIHorizontalPrec(int digits)
+ {
+ float magnitude;
+ float magLimit;
+
+ magnitude = (float)Math.Log10(Math.Abs(this.ToDouble()));
+
+ magLimit = Mathf.Max(magnitude, 6f);
+ magLimit = Mathf.Round((float)Math.Ceiling(magLimit / 3f) * 3f);
+
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(this.Label + "ⁱ:", GUILayout.ExpandWidth(true));
+ GUILayout.FlexibleSpace();
+
+ GUILayout.Label(this.ValueUnitString(3, int.MinValue, (int)magnitude - digits), GUILayout.ExpandWidth(false));
+ GUILayout.EndHorizontal();
+
+ if (Event.current.type == EventType.mouseUp)
+ {
+ Rect lastRect = GUILayoutUtility.GetLastRect();
+ if (lastRect.Contains(Event.current.mousePosition))
+ {
+ if (Event.current.button == 0)
+ {
+ digits = (digits + 3) % (int)magLimit;
+ }
+ else if (Event.current.button == 1)
+ {
+ digits = (digits - 3) % (int)magLimit;
+ if (digits < 0)
+ {
+ digits = (int)magLimit - 3;
+ }
+ }
+ }
+ }
+
+ return digits;
+ }
+ }
+
+ public class VOID_DoubleValue : VOID_NumValue<double>, IVOID_NumericValue
+ {
+ 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 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 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>
+ {
+ public VOID_StrValue(string Label, Func<string> ValueFunc) : base(Label, ValueFunc, "") {}
+ }
+}
+
+
--- a/VOID_EditorHUD.cs
+++ b/VOID_EditorHUD.cs
@@ -68,7 +68,7 @@
{
this._Name = "Heads-Up Display";
- this._Active = true;
+ this._Active.value = true;
this.textColors.Add(Color.green);
this.textColors.Add(Color.black);
--- a/VOID_HUD.cs
+++ b/VOID_HUD.cs
@@ -37,8 +37,6 @@
protected List<Color> textColors = new List<Color>();
- protected GUIStyle labelStyle;
-
/*
* Properties
* */
@@ -67,7 +65,7 @@
{
this._Name = "Heads-Up Display";
- this._Active = true;
+ this._Active.value = true;
this.textColors.Add(Color.green);
this.textColors.Add(Color.black);
@@ -79,8 +77,8 @@
this.textColors.Add(Color.cyan);
this.textColors.Add(Color.magenta);
- this.labelStyle = new GUIStyle ();
- this.labelStyle.normal.textColor = this.textColors [this.ColorIndex];
+ VOID_Core.Instance.LabelStyles["hud"] = new GUIStyle();
+ VOID_Core.Instance.LabelStyles["hud"].normal.textColor = this.textColors [this.ColorIndex];
Tools.PostDebugMessage ("VOID_HUD: Constructed.");
}
@@ -91,7 +89,7 @@
if (VOID_Core.Instance.powerAvailable)
{
- labelStyle.normal.textColor = textColors [ColorIndex];
+ VOID_Core.Instance.LabelStyles["hud"].normal.textColor = textColors [ColorIndex];
GUI.Label (
new Rect ((Screen.width * .2083f), 0, 300f, 70f),
@@ -101,8 +99,9 @@
" 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") + "°",
- labelStyle);
+ "\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),
@@ -115,13 +114,13 @@
"\nHdg: " + Tools.MuMech_get_heading (vessel).ToString ("F2") + "° " +
Tools.get_heading_text (Tools.MuMech_get_heading (vessel)) +
"\nBiome: " + Tools.Toadicus_GetAtt (vessel).name,
- labelStyle);
+ VOID_Core.Instance.LabelStyles["hud"]);
}
else
{
- labelStyle.normal.textColor = Color.red;
- GUI.Label (new Rect ((Screen.width * .2083f), 0, 300f, 70f), "-- POWER LOST --", labelStyle);
- GUI.Label (new Rect ((Screen.width * .625f), 0, 300f, 70f), "-- POWER LOST --", labelStyle);
+ 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"]);
}
}
--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -37,6 +37,8 @@
protected string _Name;
+ protected float lastUpdate = 0;
+
/*
* Properties
* */
@@ -48,7 +50,7 @@
}
set
{
- this._Active = value;
+ this._Active.value = value;
}
}
@@ -128,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;
@@ -193,10 +197,69 @@
protected float defWidth = 250f;
protected float defHeight = 50f;
- public abstract void ModuleWindow(int _);
+ 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;
+ }
+ }
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
@@ -29,6 +29,121 @@
[AVOID_SaveValue("toggleExtended")]
protected VOID_SaveValue<bool> toggleExtended = false;
+ [AVOID_SaveValue("precisionValues")]
+ protected long _precisionValues = 230584300921369395;
+ protected IntCollection precisionValues;
+
+ protected 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 (
+ "Altitude (ASL)",
+ new Func<double> (() => VOID_Core.Instance.vessel.orbit.altitude),
+ "m"
+ );
+
+ protected 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(
+ VOIDLabels.void_apoapsis,
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.ApA),
+ "m"
+ );
+
+ protected 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",
+ new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
+ );
+
+ protected VOID_StrValue timeToPeri = new VOID_StrValue(
+ "Time to Apoapsis",
+ new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
+ );
+
+ protected VOID_DoubleValue orbitInclination = new VOID_DoubleValue(
+ "Inclination",
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.inclination),
+ "°"
+ );
+
+ protected VOID_DoubleValue gravityAccel = new VOID_DoubleValue(
+ "Gravity",
+ delegate()
+ {
+ 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) /
+ Math.Pow(orbitRadius, 2);
+ },
+ "m/s²"
+ );
+
+ protected 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(
+ "Semi-Major Axis",
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.semiMajorAxis),
+ "m"
+ );
+
+ protected VOID_DoubleValue eccentricity = new VOID_DoubleValue(
+ "Eccentricity",
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricity),
+ ""
+ );
+
+ protected 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(
+ "True Anomaly",
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.trueAnomaly),
+ "°"
+ );
+
+ protected 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(
+ "Long. Ascending Node",
+ new Func<double>(() => VOID_Core.Instance.vessel.orbit.LAN),
+ "°"
+ );
+
+ protected 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(
+ "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";
@@ -39,115 +154,76 @@
public override void ModuleWindow(int _)
{
- // Toadicus edit: added local sidereal longitude.
- double LSL = vessel.longitude + vessel.orbit.referenceBody.rotationAngle;
- LSL = Tools.FixDegreeDomain (LSL);
+ base.ModuleWindow (_);
+
+ int idx = 0;
GUILayout.BeginVertical();
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(VOIDLabels.void_primary + ":");
- GUILayout.Label(vessel.mainBody.bodyName, GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(VOIDLabels.void_altitude_asl + ":");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.orbit.altitude) + "m", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(VOIDLabels.void_velocity + ":");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.orbit.vel.magnitude) + "m/s", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(VOIDLabels.void_apoapsis + ":");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.orbit.ApA) + "m", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Time to Ap:");
- GUILayout.Label(Tools.ConvertInterval(vessel.orbit.timeToAp), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(VOIDLabels.void_periapsis + ":");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.orbit.PeA) + "m", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Time to Pe:");
- GUILayout.Label(Tools.ConvertInterval(vessel.orbit.timeToPe), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Inclination:");
- GUILayout.Label(vessel.orbit.inclination.ToString("F3") + "°", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- double r_vessel = vessel.mainBody.Radius + vessel.mainBody.GetAltitude(vessel.findWorldCenterOfMass());
- double g_vessel = (VOID_Core.Constant_G * vessel.mainBody.Mass) / Math.Pow(r_vessel, 2);
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Gravity:");
- GUILayout.Label(Tools.MuMech_ToSI(g_vessel) + "m/s²", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- this.toggleExtended = GUILayout.Toggle(this.toggleExtended, "Extended info");
+ this.primaryName.DoGUIHorizontal ();
+
+ this.precisionValues [idx]= (ushort)this.orbitAltitude.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ this.precisionValues [idx]= (ushort)this.orbitVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ this.precisionValues [idx]= (ushort)this.orbitApoAlt.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ this.timeToApo.DoGUIHorizontal();
+
+ this.precisionValues [idx]= (ushort)this.oribtPeriAlt.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ this.timeToPeri.DoGUIHorizontal();
+
+ this.orbitInclination.DoGUIHorizontal("F3");
+
+ this.precisionValues [idx]= (ushort)this.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ this.toggleExtended.value = GUILayout.Toggle(this.toggleExtended, "Extended info");
if (this.toggleExtended)
{
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Period:");
- GUILayout.Label(Tools.ConvertInterval(vessel.orbit.period), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Semi-major axis:");
- GUILayout.Label((vessel.orbit.semiMajorAxis / 1000).ToString("##,#") + "km", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Eccentricity:");
- GUILayout.Label(vessel.orbit.eccentricity.ToString("F4"), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- // Toadicus edit: convert mean anomaly into degrees.
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Mean anomaly:");
- GUILayout.Label((vessel.orbit.meanAnomaly * 180d / Math.PI).ToString("F3") + "°", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("True anomaly:");
- GUILayout.Label(vessel.orbit.trueAnomaly.ToString("F3") + "°", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- // Toadicus edit: convert eccentric anomaly into degrees.
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Eccentric anomaly:");
- GUILayout.Label((vessel.orbit.eccentricAnomaly * 180d / Math.PI).ToString("F3") + "°", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Long. ascending node:");
- GUILayout.Label(vessel.orbit.LAN.ToString("F3") + "°", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Arg. of periapsis:");
- GUILayout.Label(vessel.orbit.argumentOfPeriapsis.ToString("F3") + "°", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- // Toadicus edit: added local sidereal longitude.
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Local Sidereal Longitude:");
- GUILayout.Label(LSL.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"]);
- GUILayout.EndHorizontal();
+ 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));
@@ -230,7 +230,7 @@
// Toadicus edit: added local sidereal longitude.
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Local Sidereal Longitude:");
- GUILayout.Label(LSL.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["txt_right"]);
+ GUILayout.Label(LSL.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"]);
GUILayout.EndHorizontal();
}
}
--- 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,34 +104,24 @@
public void SetValue(object v)
{
- this._value = (T)v;
+ this.value = (T)v;
}
public static implicit operator T(VOID_SaveValue<T> v)
{
- return v.value;
+ return (T)v.value;
}
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;
}
- public new string ToString()
+ public override string ToString()
{
return this.value.ToString();
}
--- a/VOID_SurfAtmo.cs
+++ b/VOID_SurfAtmo.cs
@@ -26,6 +26,102 @@
{
public class VOID_SurfAtmo : VOID_WindowModule
{
+ [AVOID_SaveValue("precisionValues")]
+ 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";
@@ -36,79 +132,61 @@
public override void ModuleWindow(int _)
{
+ base.ModuleWindow (_);
+
+ int idx = 0;
+
GUILayout.BeginVertical();
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Altitude (true):");
- double alt_true = vessel.orbit.altitude - 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 (vessel.terrainAltitude < 0 && vessel.mainBody.ocean ) alt_true = vessel.orbit.altitude;
- GUILayout.Label(Tools.MuMech_ToSI(alt_true) + "m", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal ();
+ this.precisionValues [idx]= (ushort)this.trueAltitude.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Latitude:");
- GUILayout.Label(Tools.GetLatitudeString(vessel), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.surfLatitude.DoGUIHorizontal ();
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Longitude:");
- GUILayout.Label(Tools.GetLongitudeString(vessel), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.surfLongitude.DoGUIHorizontal ();
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Heading:");
- GUILayout.Label(Tools.MuMech_get_heading(vessel).ToString("F2") + "° " + Tools.get_heading_text(Tools.MuMech_get_heading(vessel)), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.vesselHeading.DoGUIHorizontal ();
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Terrain elevation:");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.terrainAltitude) + "m", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.precisionValues [idx]= (ushort)this.terrainElevation.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Surface velocity:");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.srf_velocity.magnitude) + "m/s", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.precisionValues [idx]= (ushort)this.surfVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Vertical speed:");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.verticalSpeed) + "m/s", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.precisionValues [idx]= (ushort)this.vertVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Horizontal speed:");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.horizontalSrfSpeed) + "m/s", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.precisionValues [idx]= (ushort)this.horzVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Temperature:");
- GUILayout.Label(vessel.flightIntegrator.getExternalTemperature().ToString("F2") + "° C", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.temperature.DoGUIHorizontal ("F2");
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Atmosphere density:");
- GUILayout.Label(Tools.MuMech_ToSI(vessel.atmDensity * 1000) + "g/m³", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.atmDensity.DoGUIHorizontal (3);
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Pressure:");
- GUILayout.Label(vessel.staticPressure.ToString("F2") + " atms", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.atmPressure.DoGUIHorizontal ("F2");
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Atmosphere limit:");
- GUILayout.Label("≈ " + Tools.MuMech_ToSI(vessel.mainBody.maxAtmosphereAltitude) + "m", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ this.precisionValues [idx]= (ushort)this.atmLimit.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
// Toadicus edit: added Biome
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Biome:");
- GUILayout.Label(Tools.Toadicus_GetAtt(vessel).name, VOID_Core.Instance.LabelStyles["txt_right"]);
- GUILayout.EndHorizontal();
+ this.currBiome.DoGUIHorizontal ();
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_Transfer.cs
+++ b/VOID_Transfer.cs
@@ -27,9 +27,6 @@
{
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
@@ -20,16 +20,138 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using KSP;
using System;
+using System.Collections.Generic;
using UnityEngine;
+using Engineer.VesselSimulator;
namespace VOID
{
public class VOID_VesselInfo : VOID_WindowModule
{
- [AVOID_SaveValue("toggleExtended")]
- protected VOID_SaveValue<bool> toggleExtended = false;
-
- public VOID_VesselInfo()
+ protected VOID_DoubleValue geeForce = new VOID_DoubleValue(
+ "G-force",
+ new Func<double>(() => VOID_Core.Instance.vessel.geeForce),
+ "gees"
+ );
+
+ protected VOID_IntValue partCount = new VOID_IntValue(
+ "Parts",
+ new Func<int>(() => VOID_Core.Instance.vessel.Parts.Count),
+ ""
+ );
+
+ protected VOID_DoubleValue totalMass = new VOID_DoubleValue(
+ "Total Mass",
+ new Func<double>(() => VOID_Core.Instance.vessel.GetTotalMass()),
+ "tons"
+ );
+
+ protected VOID_DoubleValue resourceMass = new VOID_DoubleValue(
+ "Resource Mass",
+ delegate()
+ {
+ double rscMass = 0;
+ foreach (Part part in VOID_Core.Instance.vessel.Parts)
+ {
+ rscMass += part.GetResourceMass();
+ }
+ return rscMass;
+ },
+ "tons"
+ );
+
+ protected VOID_DoubleValue stageDeltaV = new VOID_DoubleValue(
+ "DeltaV (Current Stage)",
+ delegate()
+ {
+ if (SimManager.Instance.Stages == null ||
+ 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(
+ "DeltaV (Total)",
+ delegate()
+ {
+ if (SimManager.Instance.Stages == null)
+ return double.NaN;
+ return SimManager.Instance.LastStage.totalDeltaV;
+ },
+ "m/s"
+ );
+
+ protected VOID_FloatValue mainThrottle = new VOID_FloatValue(
+ "Throttle",
+ new Func<float>(() => VOID_Core.Instance.vessel.ctrlState.mainThrottle * 100f),
+ "%"
+ );
+
+ protected VOID_StrValue currmaxThrust = new VOID_StrValue(
+ "Thrust (curr/max)",
+ delegate()
+ {
+ if (SimManager.Instance.Stages == null)
+ return "N/A";
+
+ double currThrust = SimManager.Instance.LastStage.actualThrust;
+ double maxThrust = SimManager.Instance.LastStage.thrust;
+
+ return string.Format(
+ "{0} / {1}",
+ currThrust.ToString("F1"),
+ maxThrust.ToString("F1")
+ );
+ }
+ );
+
+ protected VOID_StrValue currmaxThrustWeight = new VOID_StrValue(
+ "T:W (curr/max)",
+ delegate()
+ {
+ if (SimManager.Instance.Stages == null)
+ return "N/A";
+
+ double currThrust = SimManager.Instance.LastStage.actualThrust;
+ double maxThrust = SimManager.Instance.LastStage.thrust;
+ double mass = VOID_Core.Instance.vessel.GetTotalMass();
+ double gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
+ Math.Pow(
+ VOID_Core.Instance.vessel.mainBody.Radius + VOID_Core.Instance.vessel.altitude,
+ 2
+ );
+ double weight = mass * gravity;
+
+ return string.Format(
+ "{0} / {1}",
+ (currThrust / weight).ToString("F2"),
+ (maxThrust / weight).ToString("F2")
+ );
+ }
+ );
+
+ protected VOID_DoubleValue surfaceThrustWeight = new VOID_DoubleValue(
+ "Max T:W @ surface",
+ delegate()
+ {
+ if (SimManager.Instance.Stages == null)
+ return double.NaN;
+
+ double maxThrust = SimManager.Instance.LastStage.thrust;
+ double mass = VOID_Core.Instance.vessel.GetTotalMass();
+ double gravity = (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
+ Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
+ double weight = mass * gravity;
+
+ return maxThrust / weight;
+ },
+ ""
+ );
+
+ public VOID_VesselInfo() : base()
{
this._Name = "Vessel Information";
@@ -39,102 +161,41 @@
public override void ModuleWindow(int _)
{
+ base.ModuleWindow (_);
+
if ((TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate))
{
- Engineer.VesselSimulator.SimManager.Instance.RequestSimulation();
+ SimManager.Instance.RequestSimulation();
}
- Engineer.VesselSimulator.Stage[] stages = Engineer.VesselSimulator.SimManager.Instance.Stages;
+ Stage[] stages = SimManager.Instance.Stages;
GUILayout.BeginVertical();
- GUILayout.Label(vessel.vesselName, VOID_Core.Instance.LabelStyles["center_bold"], GUILayout.ExpandWidth(true));
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("G-force:");
- GUILayout.Label(vessel.geeForce.ToString("F2") + " gees", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- int num_parts = 0;
- double total_mass = vessel.GetTotalMass();
- double resource_mass = 0;
- double max_thrust = 0;
- double final_thrust = 0;
-
- foreach (Part p in vessel.parts)
- {
- num_parts++;
- resource_mass += p.GetResourceMass();
-
- foreach (PartModule pm in p.Modules)
- {
- if ((pm.moduleName == "ModuleEngines") && ((p.State == PartStates.ACTIVE) || ((Staging.CurrentStage > Staging.lastStage) && (p.inverseStage == Staging.lastStage))))
- {
- max_thrust += ((ModuleEngines)pm).maxThrust;
- final_thrust += ((ModuleEngines)pm).finalThrust;
- }
- }
- }
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Parts:");
- GUILayout.Label(num_parts.ToString("F0"), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Total mass:");
- GUILayout.Label(total_mass.ToString("F1") + " tons", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Resource mass:");
- GUILayout.Label(resource_mass.ToString("F1") + " tons", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- if (stages.Length > Staging.lastStage)
- {
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("DeltaV (Current Stage):");
- GUILayout.Label(Tools.MuMech_ToSI(stages[Staging.lastStage].deltaV).ToString() + "m/s", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
- }
-
- if (stages.Length > 0)
- {
- double totalDeltaV = 0d;
-
- for (int i = 0; i < stages.Length; ++i)
- {
- totalDeltaV += stages [i].deltaV;
- }
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("DeltaV (Total):");
- GUILayout.Label(Tools.MuMech_ToSI(totalDeltaV).ToString() + "m/s", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
- }
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Throttle:");
- GUILayout.Label((vessel.ctrlState.mainThrottle * 100f).ToString("F0") + "%", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Thrust (curr/max):");
- GUILayout.Label(final_thrust.ToString("F1") + " / " + max_thrust.ToString("F1") + " kN", GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- double gravity = vessel.mainBody.gravParameter / Math.Pow(vessel.mainBody.Radius + vessel.altitude, 2);
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("T:W (curr/max):");
- GUILayout.Label((final_thrust / (total_mass * gravity)).ToString("F2") + " / " + (max_thrust / (total_mass * gravity)).ToString("F2"), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
-
- double g_ASL = (VOID_Core.Constant_G * vessel.mainBody.Mass) / Math.Pow(vessel.mainBody.Radius, 2);
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label("Max T:W @ surface:");
- GUILayout.Label((max_thrust / (total_mass * g_ASL)).ToString("F2"), GUILayout.ExpandWidth(false));
- GUILayout.EndHorizontal();
+ 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();
--- 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
{