VOID_Core: Changed a Math.Pow call to multiplication.
--- /dev/null
+++ b/Properties/AssemblyInfo.cs
@@ -1,1 +1,48 @@
+// VOID
+//
+// AssemblyInfo.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation and/or other
+// materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+// to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+using System.Reflection;
+using System.Runtime.CompilerServices;
+[assembly: KSPAssemblyDependency("ToadicusTools", 0, 0)]
+[assembly: KSPAssemblyDependency("VesselSimulator", 0, 0)]
+
+// Information about this assembly is defined by the following attributes.
+// Change them to the values specific to your project.
+[assembly: AssemblyTitle("VOID")]
+[assembly: AssemblyDescription("A KSP mod that provides at-a-glance information about Vessels, Orbits, and their states.")]
+[assembly: AssemblyCopyright("toadicus")]
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+[assembly: AssemblyVersion("0.11.0.*")]
+// The following attributes are used to specify the signing key for the assembly,
+// if desired. See the Mono documentation for more information about signing.
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
+
+
--- /dev/null
+++ b/VOID.csproj
@@ -1,1 +1,128 @@
+<?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_win</Configuration>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{45ACC1CC-942C-4A66-BFC7-8BE375938B18}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>VOID</RootNamespace>
+ <AssemblyName>VOID</AssemblyName>
+ <CodePage>65001</CodePage>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ReleaseVersion>0.11</ReleaseVersion>
+ <SynchReleaseVersion>false</SynchReleaseVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_win|AnyCPU' ">
+ <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 ${TargetFile} ..\..\..\Games\KSP_win\GameData\VOID\Plugins\" />
+ </CustomCommands>
+ </CustomCommands>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_win|AnyCPU' ">
+ <Optimize>false</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 ${TargetFile} ..\..\..\Games\KSP_win\GameData\VOID\Plugins\" />
+ </CustomCommands>
+ </CustomCommands>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_linux|AnyCPU' ">
+ <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="cp -afv ${TargetFile} /opt/games/KSP_linux/GameData/${ProjectName}/Plugins/" />
+ </CustomCommands>
+ </CustomCommands>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_linux|AnyCPU' ">
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Release</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CustomCommands>
+ <CustomCommands>
+ <Command type="AfterBuild" command="cp -afv ${TargetFile} /opt/games/KSP_linux/GameData/${ProjectName}/Plugins/" />
+ </CustomCommands>
+ </CustomCommands>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <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" />
+ <Compile Include="VOID_DataValue.cs" />
+ <Compile Include="VOIDEditorMaster.cs" />
+ <Compile Include="VOID_Tools.cs" />
+ <Compile Include="VOID_Localization.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <Policies>
+ <TextStylePolicy FileWidth="120" TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/plain" />
+ </Policies>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <Reference Include="System">
+ <HintPath>..\_KSPAssemblies\System.dll</HintPath>
+ </Reference>
+ <Reference Include="Assembly-CSharp">
+ <HintPath>..\_KSPAssemblies\Assembly-CSharp.dll</HintPath>
+ </Reference>
+ <Reference Include="UnityEngine">
+ <HintPath>..\_KSPAssemblies\UnityEngine.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\ToadicusTools\ToadicusTools.csproj">
+ <Project>{D48A5542-6655-4149-BC27-B27DF0466F1C}</Project>
+ <Name>ToadicusTools</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\VesselSimulator\VesselSimulator.csproj">
+ <Project>{30FD6C0B-D36E-462F-B0FF-F0FAC9C666CF}</Project>
+ <Name>VesselSimulator</Name>
+ </ProjectReference>
+ </ItemGroup>
+</Project>
--- a/VOID_CBInfoBrowser.cs
+++ b/VOID_CBInfoBrowser.cs
@@ -217,13 +217,13 @@
else GUILayout.Label((body.orbit.ApA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], 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));
+ else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.timeToAp), VOID_Core.Instance.LabelStyles["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.PeA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], 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));
+ else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.timeToPe), VOID_Core.Instance.LabelStyles["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.semiMajorAxis / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
@@ -232,10 +232,10 @@
else GUILayout.Label(body.orbit.eccentricity.ToString("F4") + "", VOID_Core.Instance.LabelStyles["right"], 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));
-
- 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));
+ else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.period), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+ if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+ else GUILayout.Label(VOID_Tools.ConvertInterval(body.rotationPeriod), VOID_Core.Instance.LabelStyles["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.orbitalSpeed / 1000).ToString("F2") + "km/s", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -38,6 +38,7 @@
{
public class VOID_Core : VOID_Module, IVOID_Module
{
+ #region Singleton Members
/*
* Static Members
* */
@@ -72,13 +73,15 @@
_instance = null;
_initialized = false;
}
+ #endregion
public static double Constant_G = 6.674e-11;
+
/*
* Fields
* */
protected string VoidName = "VOID";
- protected string VoidVersion = "0.10.0";
+ protected string VoidVersion = "0.11.0";
protected bool _factoryReset = false;
@@ -136,6 +139,9 @@
protected VOID_SaveValue<double> _updatePeriod = 1001f / 15000f;
protected float _updateTimer = 0f;
protected string stringFrequency;
+
+ [AVOID_SaveValue("vesselSimActive")]
+ protected VOID_SaveValue<bool> vesselSimActive;
// Vessel Type Housekeeping
protected List<VesselType> _allVesselTypes = new List<VesselType>();
@@ -472,11 +478,15 @@
{
this.LoadBeforeUpdate();
- if (this.vessel != null)
+ if (this.vessel != null && this.vesselSimActive)
{
SimManager.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
Math.Pow(VOID_Core.Instance.vessel.Radius(), 2);
SimManager.TryStartSimulation();
+ }
+ else if (!this.vesselSimActive)
+ {
+ SimManager.ClearResults();
}
if (!this.guiRunning)
@@ -621,6 +631,9 @@
}
this.UseToolbarManager = GUILayout.Toggle(this.UseToolbarManager, "Use Blizzy's Toolbar If Available");
+
+ this.vesselSimActive.value = GUILayout.Toggle(this.vesselSimActive.value,
+ "Enable Engineering Calculations");
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -988,6 +1001,8 @@
this.VOIDIconOffInactivePath = "VOID/Textures/void_icon_light";
this.VOIDIconOffActivePath = "VOID/Textures/void_icon_dark";
+ this.vesselSimActive = true;
+
this.UseToolbarManager = false;
this.LoadConfig();
@@ -1018,7 +1033,7 @@
{
get
{
- return core.Kerbin.gravParameter / Math.Pow(core.Kerbin.Radius, 2);
+ return core.Kerbin.gravParameter / (core.Kerbin.Radius * core.Kerbin.Radius);
}
}
}
--- a/VOID_DataLogger.cs
+++ b/VOID_DataLogger.cs
@@ -97,7 +97,7 @@
GUILayout.BeginVertical();
GUILayout.Label("System time: " + DateTime.Now.ToString("HH:mm:ss"));
- GUILayout.Label(Tools.ConvertInterval(stopwatch1));
+ GUILayout.Label(VOID_Tools.ConvertInterval(stopwatch1));
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
if (GUILayout.Button("Start"))
--- a/VOID_EditorCore.cs
+++ b/VOID_EditorCore.cs
@@ -129,10 +129,14 @@
this.StartGUI();
}
- if (EditorLogic.SortedShipList.Count > 0)
+ if (EditorLogic.SortedShipList.Count > 0 && this.vesselSimActive)
{
SimManager.Gravity = VOID_Data.KerbinGee;
SimManager.TryStartSimulation();
+ }
+ else if (!this.vesselSimActive)
+ {
+ SimManager.ClearResults();
}
this.CheckAndSave ();
--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -129,7 +129,14 @@
{
public static readonly VOID_StrValue primaryName = new VOID_StrValue (
VOID_Localization.void_primary,
- new Func<string> (() => VOID_Core.Instance.vessel.mainBody.name)
+ delegate()
+ {
+ if (VOID_Core.Instance.vessel == null)
+ {
+ return string.Empty;
+ }
+ return VOID_Core.Instance.vessel.mainBody.name;
+ }
);
public static readonly VOID_DoubleValue orbitAltitude = new VOID_DoubleValue (
@@ -158,12 +165,12 @@
public static readonly VOID_StrValue timeToApo = new VOID_StrValue(
"Time to Apoapsis",
- new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
+ new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
);
public static readonly VOID_StrValue timeToPeri = new VOID_StrValue(
"Time to Periapsis",
- new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
+ new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
);
public static readonly VOID_DoubleValue orbitInclination = new VOID_DoubleValue(
@@ -186,7 +193,7 @@
public static readonly VOID_StrValue orbitPeriod = new VOID_StrValue(
"Period",
- new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
+ new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
);
public static readonly VOID_DoubleValue semiMajorAxis = new VOID_DoubleValue(
@@ -233,7 +240,7 @@
public static readonly VOID_DoubleValue localSiderealLongitude = new VOID_DoubleValue(
"Local Sidereal Longitude",
- new Func<double>(() => Tools.FixDegreeDomain(
+ new Func<double>(() => VOID_Tools.FixDegreeDomain(
VOID_Core.Instance.vessel.longitude + VOID_Core.Instance.vessel.orbit.referenceBody.rotationAngle)),
"°"
);
--- a/VOID_Rendezvous.cs
+++ b/VOID_Rendezvous.cs
@@ -151,7 +151,7 @@
// Toadicus edit: added local sidereal longitude.
// Toadicus edit: added local sidereal longitude.
double LSL = v.longitude + v.orbit.referenceBody.rotationAngle;
- LSL = Tools.FixDegreeDomain (LSL);
+ LSL = VOID_Tools.FixDegreeDomain (LSL);
//display orbital info for orbiting/flying/suborbital/escaping vessels only
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -199,7 +199,7 @@
{
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Period:");
- GUILayout.Label(Tools.ConvertInterval(v.orbit.period), GUILayout.ExpandWidth(false));
+ GUILayout.Label(VOID_Tools.ConvertInterval(v.orbit.period), GUILayout.ExpandWidth(false));
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -250,12 +250,12 @@
{
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Latitude:");
- GUILayout.Label(Tools.GetLatitudeString(vessel), GUILayout.ExpandWidth(false));
+ GUILayout.Label(VOID_Tools.GetLatitudeString(vessel), GUILayout.ExpandWidth(false));
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Longitude:");
- GUILayout.Label(Tools.GetLongitudeString(vessel), GUILayout.ExpandWidth(false));
+ GUILayout.Label(VOID_Tools.GetLongitudeString(vessel), GUILayout.ExpandWidth(false));
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -300,28 +300,28 @@
//SUN2PLANET:
if (vessel.mainBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody)
{
- Tools.display_transfer_angles_SUN2PLANET(cb, vessel);
+ VOID_Tools.display_transfer_angles_SUN2PLANET(cb, vessel);
//if (debugging) Debug.Log("[VOID] SUN2PLANET OK");
}
//PLANET2PLANET
else if (vessel.mainBody.referenceBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody.referenceBody)
{
- Tools.display_transfer_angles_PLANET2PLANET(cb, vessel);
+ VOID_Tools.display_transfer_angles_PLANET2PLANET(cb, vessel);
//if (debugging) Debug.Log("[VOID] PLANET2PLANET OK");
}
//PLANET2MOON
else if (vessel.mainBody.referenceBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody)
{
- Tools.display_transfer_angles_PLANET2MOON(cb, vessel);
+ VOID_Tools.display_transfer_angles_PLANET2MOON(cb, vessel);
//if (debugging) Debug.Log("[VOID] PLANET2MOON OK");
}
//MOON2MOON
else if (vessel.mainBody.referenceBody.referenceBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody.referenceBody)
{
- Tools.display_transfer_angles_MOON2MOON(cb, vessel);
+ VOID_Tools.display_transfer_angles_MOON2MOON(cb, vessel);
//if (debugging) Debug.Log("[VOID] MOON2MOON OK");
}
--- a/VOID_SurfAtmo.cs
+++ b/VOID_SurfAtmo.cs
@@ -125,12 +125,12 @@
public static readonly VOID_StrValue surfLatitude = new VOID_StrValue(
"Latitude",
- new Func<string> (() => Tools.GetLatitudeString(VOID_Core.Instance.vessel))
+ new Func<string> (() => VOID_Tools.GetLatitudeString(VOID_Core.Instance.vessel))
);
public static readonly VOID_StrValue surfLongitude = new VOID_StrValue(
"Longitude",
- new Func<string> (() => Tools.GetLongitudeString(VOID_Core.Instance.vessel))
+ new Func<string> (() => VOID_Tools.GetLongitudeString(VOID_Core.Instance.vessel))
);
public static readonly VOID_StrValue vesselHeading = new VOID_StrValue(
@@ -138,7 +138,7 @@
delegate()
{
double heading = core.vessel.getSurfaceHeading();
- string cardinal = Tools.get_heading_text(heading);
+ string cardinal = VOID_Tools.get_heading_text(heading);
return string.Format(
"{0}° {1}",
@@ -198,7 +198,7 @@
public static readonly VOID_StrValue currBiome = new VOID_StrValue(
"Biome",
- new Func<string> (() => Tools.GetBiome(VOID_Core.Instance.vessel).name)
+ new Func<string> (() => VOID_Tools.GetBiome(VOID_Core.Instance.vessel).name)
);
}
--- a/VOID_Tools.cs
+++ b/VOID_Tools.cs
@@ -30,9 +30,9 @@
using System;
using UnityEngine;
-namespace ToadicusTools
+namespace VOID
{
- public static partial class Tools
+ public static partial class VOID_Tools
{
#region VESSEL_EXTENSIONS_SCIENCE
public static CBAttributeMap.MapAttribute GetBiome(this Vessel vessel)
@@ -111,6 +111,11 @@
public static ExperimentSituations GetExperimentSituation(this Vessel vessel)
{
+ if (vessel == null)
+ {
+ return ExperimentSituations.SrfSplashed;
+ }
+
Vessel.Situations situation = vessel.situation;
switch (situation)
@@ -251,54 +256,69 @@
}
#endregion
+ /// <summary>
+ /// Converts the interval given in seconds to a human-friendly
+ /// time period in [years], [days], hours, minutes, and seconds.
+ ///
+ /// Uses sidereal days, since "6 hours per day" is the Kerbal standard.
+ /// </summary>
+ /// <returns>Human readable interval</returns>
+ /// <param name="seconds"></param>
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);
- }
- catch (OverflowException)
- {
- return "NaN";
- }
-
- int years = interval.Days / 365;
-
- string output;
+ double SecondsPerMinute = 60d;
+ double SecondsPerHour = 3600d;
+ double SecondsPerDay;
+ double SecondsPerYear;
+
+ if (GameSettings.KERBIN_TIME)
+ {
+ SecondsPerDay = 21600d;
+ SecondsPerYear = 9203545d;
+ }
+ else
+ {
+ SecondsPerDay = 86164.1d;
+ SecondsPerYear = 31558149d;
+ }
+
+ int years;
+ int days;
+ int hours;
+ int minutes;
+
+ years = (int)(seconds / SecondsPerYear);
+
+ seconds %= SecondsPerYear;
+
+ days = (int)(seconds / SecondsPerDay);
+
+ seconds %= SecondsPerDay;
+
+ hours = (int)(seconds / SecondsPerHour);
+
+ seconds %= SecondsPerHour;
+
+ minutes = (int)(seconds / SecondsPerMinute);
+
+ seconds %= SecondsPerMinute;
+
+ string format_1 = "{0:D1}y {1:D1}d {2:D2}h {3:D2}m {4:00.0}s";
+ string format_2 = "{0:D1}d {1:D2}h {2:D2}m {3:00.0}s";
+ string format_3 = "{0:D2}h {1:D2}m {2:00.0}s";
+
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));
+ return string.Format(format_1, years, days, hours, minutes, seconds);
+ }
+ else if (days > 0)
+ {
+ return string.Format(format_2, days, hours, minutes, seconds);
}
else
{
- output = string.Format(format_3,
- interval.Hours,
- interval.Minutes,
- interval.Seconds,
- interval.Milliseconds.ToString().Substring(0, 1));
- }
- return output;
+ return string.Format(format_3, hours, minutes, seconds);
+ }
}
public static string UppercaseFirst(string s)
@@ -511,7 +531,7 @@
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Phase angle (curr/trans):");
GUILayout.Label(
- Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + Tools.Nivvy_CalcTransferPhaseAngle(
+ VOID_Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + VOID_Tools.Nivvy_CalcTransferPhaseAngle(
vessel.orbit.semiMajorAxis,
body.orbit.semiMajorAxis,
vessel.mainBody.gravParameter
@@ -523,7 +543,7 @@
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Transfer velocity:");
GUILayout.Label(
- (Tools.Younata_DeltaVToGetToOtherBody(
+ (VOID_Tools.Younata_DeltaVToGetToOtherBody(
(vessel.mainBody.gravParameter / 1000000000),
(vessel.orbit.semiMajorAxis / 1000),
(body.orbit.semiMajorAxis / 1000)
@@ -535,46 +555,46 @@
public static void display_transfer_angles_PLANET2PLANET(CelestialBody body, Vessel vessel)
{
- double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+ double dv1 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
(vessel.mainBody.referenceBody.gravParameter / 1000000000),
(vessel.mainBody.orbit.semiMajorAxis / 1000),
(body.orbit.semiMajorAxis / 1000)
);
- double dv2 = Tools.Younata_DeltaVToExitSOI(
+ double dv2 = VOID_Tools.Younata_DeltaVToExitSOI(
(vessel.mainBody.gravParameter / 1000000000),
(vessel.orbit.semiMajorAxis / 1000),
(vessel.mainBody.sphereOfInfluence / 1000),
Math.Abs(dv1)
);
- double trans_ejection_angle = Tools.Younata_TransferBurnPoint(
+ double trans_ejection_angle = VOID_Tools.Younata_TransferBurnPoint(
(vessel.orbit.semiMajorAxis / 1000),
dv2,
(Math.PI / 2.0),
(vessel.mainBody.gravParameter / 1000000000)
);
- double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(
+ double curr_ejection_angle = VOID_Tools.Adammada_CurrentEjectionAngle(
FlightGlobals.ActiveVessel.longitude,
FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle,
FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
);
- double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+ double trans_phase_angle = VOID_Tools.Nivvy_CalcTransferPhaseAngle(
vessel.mainBody.orbit.semiMajorAxis,
body.orbit.semiMajorAxis,
vessel.mainBody.referenceBody.gravParameter
) % 360;
- double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(
+ double curr_phase_angle = VOID_Tools.Adammada_CurrrentPhaseAngle(
body.orbit.LAN,
body.orbit.orbitPercent,
FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
);
- double adj_phase_angle = Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
- double adj_trans_ejection_angle = Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
- double adj_curr_ejection_angle = Tools.adjust_current_ejection_angle(curr_ejection_angle);
+ double adj_phase_angle = VOID_Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
+ double adj_trans_ejection_angle = VOID_Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
+ double adj_curr_ejection_angle = VOID_Tools.adjust_current_ejection_angle(curr_ejection_angle);
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Phase angle (curr/trans):");
@@ -600,13 +620,13 @@
public static void display_transfer_angles_PLANET2MOON(CelestialBody body, Vessel vessel)
{
- double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+ double dv1 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
(vessel.mainBody.gravParameter / 1000000000),
(vessel.orbit.semiMajorAxis / 1000),
(body.orbit.semiMajorAxis / 1000)
);
- double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+ double trans_phase_angle = VOID_Tools.Nivvy_CalcTransferPhaseAngle(
vessel.orbit.semiMajorAxis,
body.orbit.semiMajorAxis,
vessel.mainBody.gravParameter
@@ -615,7 +635,7 @@
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label("Phase angle (curr/trans):");
GUILayout.Label(
- Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+ VOID_Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
GUILayout.ExpandWidth(false)
);
GUILayout.EndHorizontal();
@@ -628,50 +648,50 @@
public static void display_transfer_angles_MOON2MOON(CelestialBody body, Vessel vessel)
{
- double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+ double dv1 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
(vessel.mainBody.referenceBody.gravParameter / 1000000000),
(vessel.mainBody.orbit.semiMajorAxis / 1000),
(body.orbit.semiMajorAxis / 1000)
);
- double dv2 = Tools.Younata_DeltaVToExitSOI(
+ double dv2 = VOID_Tools.Younata_DeltaVToExitSOI(
(vessel.mainBody.gravParameter / 1000000000),
(vessel.orbit.semiMajorAxis / 1000),
(vessel.mainBody.sphereOfInfluence / 1000),
Math.Abs(dv1)
);
- double trans_ejection_angle = Tools.Younata_TransferBurnPoint(
+ double trans_ejection_angle = VOID_Tools.Younata_TransferBurnPoint(
(vessel.orbit.semiMajorAxis / 1000),
dv2,
(Math.PI / 2.0),
(vessel.mainBody.gravParameter / 1000000000)
);
- double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(
+ double curr_phase_angle = VOID_Tools.Adammada_CurrrentPhaseAngle(
body.orbit.LAN,
body.orbit.orbitPercent,
FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
);
- double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(
+ double curr_ejection_angle = VOID_Tools.Adammada_CurrentEjectionAngle(
FlightGlobals.ActiveVessel.longitude,
FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle,
FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
);
- double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+ double trans_phase_angle = VOID_Tools.Nivvy_CalcTransferPhaseAngle(
vessel.mainBody.orbit.semiMajorAxis,
body.orbit.semiMajorAxis,
vessel.mainBody.referenceBody.gravParameter
) % 360;
- double adj_phase_angle = Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
+ double adj_phase_angle = VOID_Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
//double adj_ejection_angle = adjustCurrEjectionAngle(trans_phase_angle, curr_ejection_angle);
//new stuff
//
- double adj_trans_ejection_angle = Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
- double adj_curr_ejection_angle = Tools.adjust_current_ejection_angle(curr_ejection_angle);
+ double adj_trans_ejection_angle = VOID_Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
+ double adj_curr_ejection_angle = VOID_Tools.adjust_current_ejection_angle(curr_ejection_angle);
//
//
--- a/VOID_Transfer.cs
+++ b/VOID_Transfer.cs
@@ -68,7 +68,7 @@
if (selectedBodies.Contains(body))
{
- Tools.display_transfer_angles_SUN2PLANET(body, vessel); //show phase angles for each selected body
+ VOID_Tools.display_transfer_angles_SUN2PLANET(body, vessel); //show phase angles for each selected body
tad_targeting(body); //display Set/Unset Target button for each selected body
}
}
@@ -91,7 +91,7 @@
if (selectedBodies.Contains(body))
{
- Tools.display_transfer_angles_PLANET2PLANET(body, vessel);
+ VOID_Tools.display_transfer_angles_PLANET2PLANET(body, vessel);
tad_targeting(body); //display Set/Unset Target button
}
}
@@ -110,7 +110,7 @@
if (selectedBodies.Contains(body))
{
- Tools.display_transfer_angles_PLANET2MOON(body, vessel);
+ VOID_Tools.display_transfer_angles_PLANET2MOON(body, vessel);
tad_targeting(body); //display Set/Unset Target button
}
}
@@ -133,7 +133,7 @@
if (selectedBodies.Contains(body))
{
- Tools.display_transfer_angles_MOON2MOON(body, vessel);
+ VOID_Tools.display_transfer_angles_MOON2MOON(body, vessel);
tad_targeting(body); //display Set/Unset Target button
}
}
--- a/VOID_VesselRegister.cs
+++ b/VOID_VesselRegister.cs
@@ -115,7 +115,7 @@
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label(
- Tools.UppercaseFirst(vesselSituation) + " " + selectedVesselType.ToString() + "s @ " + seletedBody.bodyName,
+ VOID_Tools.UppercaseFirst(vesselSituation) + " " + selectedVesselType.ToString() + "s @ " + seletedBody.bodyName,
VOID_Core.Instance.LabelStyles["center"],
GUILayout.ExpandWidth(true));
GUILayout.EndHorizontal();