Stock sections in the Flight Engineer can now become HUDs.
--- a/Documents/CHANGES.txt
+++ b/Documents/CHANGES.txt
@@ -1,3 +1,51 @@
+1.0.17.0
+ Added: 'Mach Number' readout under the 'Surface' category and included it on the default surface HUD.
+ Added 'Thermal' readouts category including:
+ Internal Flux
+ Convection Flux
+ Radiation Flux
+ Critical Part Name
+ Critical Part Temperature
+ Critical Part Skin Temperature
+ Critical Part Thermal Percentage of Max Temperature
+ Hottest Part Name
+ Hottest Part Temperature
+ Hottest Part Skin Temperature
+ Coldest Part Name
+ Coldest Part Temperature
+ Coldest Part Skin Temperature
+
+ Changed: Mach on the Build Engineer now accurate to 2 decimal places.
+ Changed: Max mach in the Build Engineer defaults to 1.00 even when no jet engines are present.
+ Changed: Increased eccentricity readout to 5 decimal places.
+ Changed: Implemented Sarbian's object pooling.
+ Changed: How the default selected body is assigned to 'Planitarium.Home'.
+ Changed: HUDs to clamp fully inside the screen instead of allowing them to run off the edge by a certain amount.
+ Fixed: Physically insignificant part mass is now associated with the parent part.
+ Fixed: Longitude and Latitude readouts now use a KER formatter instead of Squad's incorrect implementation.
+ Fixed: Possible null reference in the Rendezvous Processor.
+ Fixed: Fairing mass issues introduced with regards to simulation changes.
+ Fixed: Use of per-propellant fuel flow mode override.
+ Fixed: Burn times calculated for jet engines.
+ Fixed: Thrust issues introduced with Sarbian's simulation alterations.
+ Fixed: Issue where HUDs positioned close to the top/bottom of the screen could be pushed out of position.
+
+1.0.16.6, 02-05-15
+ Fixed: Separately staged fairing mass jettisons are now calculated in the editor.
+
+1.0.16.5, 02-05-2015
+ Fixed: Delta-V not being correctly calculated.
+ Changed: Editor locking now uses the InputLockManager.
+
+1.0.16.4, 01-05-2015
+ Fixed: Physically insignificant part mass is now accounted for.
+ Changed: Module mass accounted for as it now makes its way onto the launch pad (e.g. fairings).
+
+ Various optimisations:
+ Object pooling.
+ Removed LINQ expressions.
+ Converted foreach to for loops.
+
1.0.16.3, 27-04-2015
Fixed issue with the toolbar icons not being created.
Removed superfluous 'm/s' on the mach slider in the build engineer.
--- a/KerbalEngineer/CelestialBodies.cs
+++ b/KerbalEngineer/CelestialBodies.cs
@@ -37,7 +37,8 @@
try
{
SystemBody = new BodyInfo(PSystemManager.Instance.localBodies.Find(b => b.referenceBody == null || b.referenceBody == b));
- if (!SetSelectedBody("Kerbin"))
+ String homeCBName = Planetarium.fetch.Home.bodyName;
+ if (!SetSelectedBody(homeCBName))
{
SelectedBody = SystemBody;
SelectedBody.SetSelected(true);
--- a/KerbalEngineer/Control/ControlCentre.cs
+++ b/KerbalEngineer/Control/ControlCentre.cs
@@ -142,7 +142,7 @@
try
{
GUI.skin = null;
- this.position = GUILayout.Window(this.GetInstanceID(), this.position, this.Window, "KERBAL ENGINEER REDUX " + EngineerGlobals.AssemblyVersion + " - CONTROL CENTRE", HighLogic.Skin.window);
+ this.position = GUILayout.Window(this.GetInstanceID(), this.position, this.Window, "KERBAL ENGINEER REDUX " + EngineerGlobals.ASSEMBLY_VERSION + " - CONTROL CENTRE", HighLogic.Skin.window);
this.CentreWindow();
}
catch (Exception ex)
--- a/KerbalEngineer/Editor/BuildAdvanced.cs
+++ b/KerbalEngineer/Editor/BuildAdvanced.cs
@@ -215,7 +215,7 @@
}
// Change the window title based on whether in compact mode or not.
- title = !compactMode ? "KERBAL ENGINEER REDUX " + EngineerGlobals.AssemblyVersion : "K.E.R. " + EngineerGlobals.AssemblyVersion + (showAtmosphericDetails ? " (ATMOS.)" : String.Empty);
+ title = !compactMode ? "KERBAL ENGINEER REDUX " + EngineerGlobals.ASSEMBLY_VERSION : "K.E.R. " + EngineerGlobals.ASSEMBLY_VERSION;
// Reset the window size when the staging or something else has changed.
stagesLength = stages.Length;
@@ -354,7 +354,7 @@
GUILayout.Space(5.0f);
GUILayout.BeginVertical();
- GUILayout.Label("Mach: " + atmosphericMach.ToString("F1"), settingAtmoStyle, GUILayout.Width(125.0f * GuiDisplaySize.Offset));
+ GUILayout.Label("Mach: " + atmosphericMach.ToString("F2"), settingAtmoStyle, GUILayout.Width(125.0f * GuiDisplaySize.Offset));
GUI.skin = HighLogic.Skin;
atmosphericMach = GUILayout.HorizontalSlider(Mathf.Clamp(atmosphericMach, 0.0f, maxMach), 0.0f, maxMach);
GUI.skin = null;
@@ -525,6 +525,11 @@
GUILayout.BeginHorizontal();
GUILayout.Label("Simulate using vectored thrust values:");
SimManager.vectoredThrust = GUILayout.Toggle(SimManager.vectoredThrust, "ENABLED", buttonStyle, GUILayout.Width(100.0f * GuiDisplaySize.Offset));
+ GUILayout.EndHorizontal();
+
+ GUILayout.BeginHorizontal();
+ GUILayout.Label("Verbose Simulation Log:");
+ SimManager.logOutput = GUILayout.Toggle(SimManager.logOutput, "ENABLED", buttonStyle, GUILayout.Width(100.0f * GuiDisplaySize.Offset));
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal();
@@ -640,13 +645,13 @@
{
if (state)
{
- EditorLogic.fetch.Lock(true, true, true, "KER_BuildAdvanced");
+ InputLockManager.SetControlLock(ControlTypes.All, "KER_BuildAdvanced");
BuildOverlayPartInfo.Hidden = true;
isEditorLocked = true;
}
else
{
- EditorLogic.fetch.Unlock("KER_BuildAdvanced");
+ InputLockManager.SetControlLock(ControlTypes.None, "KER_BuildAdvanced");
BuildOverlayPartInfo.Hidden = false;
isEditorLocked = false;
}
@@ -823,6 +828,14 @@
bodiesListPosition = new Rect(position.width - 452.0f * GuiDisplaySize.Offset, 5.0f, 125.0f * GuiDisplaySize.Offset, 20.0f);
bodiesList.enabled = GUI.Toggle(bodiesListPosition, bodiesList.enabled, "BODY: " + CelestialBodies.SelectedBody.Name.ToUpper(), buttonStyle);
bodiesList.SetPosition(bodiesListPosition.Translate(position));
+ }
+ else
+ {
+ if (GUI.Toggle(new Rect(position.width - 133.0f * GuiDisplaySize.Offset, 5.0f, 60.0f * GuiDisplaySize.Offset, 20.0f), showAtmosphericDetails, "ATMO", buttonStyle) != showAtmosphericDetails)
+ {
+ hasChanged = true;
+ showAtmosphericDetails = !showAtmosphericDetails;
+ }
}
// Draw the main informational display box.
@@ -841,7 +854,7 @@
DrawBurnTime();
GUILayout.EndHorizontal();
- if (showAtmosphericDetails)
+ if (showAtmosphericDetails && !compactMode)
{
GUILayout.BeginVertical(areaSettingStyle);
DrawAtmosphericDetails();
--- a/KerbalEngineer/Editor/PartInfoItem.cs
+++ b/KerbalEngineer/Editor/PartInfoItem.cs
@@ -19,38 +19,69 @@
namespace KerbalEngineer.Editor
{
+ using System.Collections.Generic;
using VesselSimulator;
- public class PartInfoItem : Pool<PartInfoItem>
+ public class PartInfoItem
{
+ private static readonly Pool<PartInfoItem> pool = new Pool<PartInfoItem>(Create, Reset);
+
public string Name { get; set; }
public string Value { get; set; }
+ private static PartInfoItem Create()
+ {
+ return new PartInfoItem();
+ }
+
+ public void Release()
+ {
+ pool.Release(this);
+ }
+
+ public static void Release(List<PartInfoItem> objList)
+ {
+ for (int i = 0; i < objList.Count; ++i)
+ {
+ objList[i].Release();
+ }
+ }
+
+ private static void Reset(PartInfoItem obj)
+ {
+ obj.Name = string.Empty;
+ obj.Value = string.Empty;
+ }
+
public static PartInfoItem Create(string name)
{
- return GetPoolObject().Initialise(name);
+ return New(name);
}
public static PartInfoItem Create(string name, string value)
{
- return GetPoolObject().Initialise(name, value);
+ return New(name, value);
}
- public PartInfoItem Initialise(string name)
+ public static PartInfoItem New(string name)
{
- Name = name;
- Value = string.Empty;
+ PartInfoItem obj = pool.Borrow();
+
+ obj.Name = name;
+ obj.Value = string.Empty;
- return this;
+ return obj;
}
- public PartInfoItem Initialise(string name, string value)
+ public static PartInfoItem New(string name, string value)
{
- Name = name;
- Value = value;
+ PartInfoItem obj = pool.Borrow();
- return this;
+ obj.Name = name;
+ obj.Value = value;
+
+ return obj;
}
}
}
--- a/KerbalEngineer/EngineerGlobals.cs
+++ b/KerbalEngineer/EngineerGlobals.cs
@@ -1,7 +1,5 @@
//
-// Kerbal Engineer Redux
-//
-// Copyright (C) 2014 CYBUTEK
+// Copyright (C) 2015 CYBUTEK
//
// 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
@@ -17,42 +15,31 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
-#region Using Directives
-
-using System.IO;
-using System.Reflection;
-
-#endregion
-
namespace KerbalEngineer
{
- public class EngineerGlobals
+ using System.IO;
+ using System.Reflection;
+
+ public static class EngineerGlobals
{
- #region Constants
-
/// <summary>
/// Current version of the Kerbal Engineer assembly.
/// </summary>
- public const string AssemblyVersion = "1.0.16.3";
-
- #endregion
-
- #region Fields
+ public const string ASSEMBLY_VERSION = "1.0.17.0";
private static string assemblyFile;
private static string assemblyName;
private static string assemblyPath;
-
- #endregion
-
- #region Properties
/// <summary>
/// Gets the Kerbal Engineer assembly's path including the file name.
/// </summary>
public static string AssemblyFile
{
- get { return assemblyFile ?? (assemblyFile = Assembly.GetExecutingAssembly().Location); }
+ get
+ {
+ return assemblyFile ?? (assemblyFile = Assembly.GetExecutingAssembly().Location);
+ }
}
/// <summary>
@@ -60,7 +47,10 @@
/// </summary>
public static string AssemblyName
{
- get { return assemblyName ?? (assemblyName = new FileInfo(AssemblyFile).Name); }
+ get
+ {
+ return assemblyName ?? (assemblyName = new FileInfo(AssemblyFile).Name);
+ }
}
/// <summary>
@@ -68,9 +58,10 @@
/// </summary>
public static string AssemblyPath
{
- get { return assemblyPath ?? (assemblyPath = AssemblyFile.Replace(new FileInfo(AssemblyFile).Name, "")); }
+ get
+ {
+ return assemblyPath ?? (assemblyPath = AssemblyFile.Replace(new FileInfo(AssemblyFile).Name, ""));
+ }
}
-
- #endregion
}
}
--- a/KerbalEngineer/Extensions/DoubleExtensions.cs
+++ b/KerbalEngineer/Extensions/DoubleExtensions.cs
@@ -1,7 +1,7 @@
//
// Kerbal Engineer Redux
//
-// Copyright (C) 2014 CYBUTEK
+// Copyright (C) 2015 CYBUTEK
//
// 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
@@ -17,18 +17,12 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
-#region Using Directives
-
-using KerbalEngineer.Helpers;
-
-#endregion
-
namespace KerbalEngineer.Extensions
{
+ using Helpers;
+
public static class DoubleExtensions
{
- #region Methods: public
-
public static double Clamp(this double value, double lower, double higher)
{
return value < lower ? lower : value > higher ? higher : value;
@@ -49,14 +43,19 @@
return Units.ToDistance(value);
}
- public static string ToTorque(this double value)
+ public static string ToFlux(this double value)
{
- return Units.ToTorque(value);
+ return Units.ToFlux(value);
}
public static string ToForce(this double value)
{
return Units.ToForce(value);
+ }
+
+ public static string ToMach(this double value)
+ {
+ return Units.ToMach(value);
}
public static string ToMass(this double value)
@@ -79,6 +78,14 @@
return Units.ToSpeed(value);
}
- #endregion
+ public static string ToTemperature(this double value)
+ {
+ return Units.ToTemperature(value);
+ }
+
+ public static string ToTorque(this double value)
+ {
+ return Units.ToTorque(value);
+ }
}
}
--- a/KerbalEngineer/Extensions/FloatExtensions.cs
+++ b/KerbalEngineer/Extensions/FloatExtensions.cs
@@ -1,7 +1,7 @@
//
// Kerbal Engineer Redux
//
-// Copyright (C) 2014 CYBUTEK
+// Copyright (C) 2015 CYBUTEK
//
// 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
@@ -17,18 +17,12 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
-#region Using Directives
-
-using KerbalEngineer.Helpers;
-
-#endregion
-
namespace KerbalEngineer.Extensions
{
+ using Helpers;
+
public static class FloatExtensions
{
- #region Methods: public
-
public static string ToAcceleration(this float value)
{
return Units.ToAcceleration(value);
@@ -44,14 +38,19 @@
return Units.ToDistance(value);
}
+ public static string ToFlux(this float value)
+ {
+ return Units.ToFlux(value);
+ }
+
public static string ToForce(this float value)
{
return Units.ToForce(value);
}
- public static string ToTorque(this float value)
+ public static string ToMach(this float value)
{
- return Units.ToTorque(value);
+ return Units.ToMach(value);
}
public static string ToMass(this float value)
@@ -74,6 +73,14 @@
return Units.ToSpeed(value);
}
- #endregion
+ public static string ToTemperature(this float value)
+ {
+ return Units.ToTemperature(value);
+ }
+
+ public static string ToTorque(this float value)
+ {
+ return Units.ToTorque(value);
+ }
}
}
--- a/KerbalEngineer/Extensions/PartExtensions.cs
+++ b/KerbalEngineer/Extensions/PartExtensions.cs
@@ -25,9 +25,9 @@
public static class PartExtensions
{
- private static Part cachePart;
- private static PartModule cachePartModule;
- private static PartResource cachePartResource;
+ //private static Part cachePart;
+ //private static PartModule cachePartModule;
+ //private static PartResource cachePartResource;
/// <summary>
/// Gets whether the part contains a specific resource.
@@ -55,9 +55,10 @@
/// <summary>
/// Gets whether the part has fuel.
/// </summary>
+ /* not used
public static bool EngineHasFuel(this Part part)
{
- cachePartModule = GetModule<ModuleEngines>(part);
+ PartModule cachePartModule = GetModule<ModuleEngines>(part);
if (cachePartModule != null)
{
return (cachePartModule as ModuleEngines).getFlameoutState;
@@ -71,7 +72,7 @@
return false;
}
-
+ */
/// <summary>
/// Gets the cost of the part excluding resources.
/// </summary>
@@ -89,11 +90,27 @@
}
/// <summary>
+ /// Gets the cost of the part modules
+ /// Same as stock but without mem allocation
+ /// </summary>
+ public static double GetModuleCostsNoAlloc(this Part part, float defaultCost)
+ {
+ float cost = 0f;
+ for (int i = 0; i < part.Modules.Count; i++)
+ {
+ PartModule pm = part.Modules[i];
+ if (pm is IPartCostModifier)
+ cost += (pm as IPartCostModifier).GetModuleCost(defaultCost);
+ }
+ return cost;
+ }
+
+ /// <summary>
/// Gets the cost of the part including resources.
/// </summary>
public static double GetCostWet(this Part part)
{
- return part.partInfo.cost - GetResourceCostInverted(part) + part.GetModuleCosts(0.0f);
+ return part.partInfo.cost - GetResourceCostInverted(part) + part.GetModuleCostsNoAlloc(0.0f); // part.GetModuleCosts allocate 44B per call.
}
/// <summary>
@@ -107,9 +124,10 @@
/// <summary>
/// Gets the maximum thrust of the part if it's an engine.
/// </summary>
+ /* not used
public static double GetMaxThrust(this Part part)
{
- cachePartModule = GetModule<ModuleEngines>(part);
+ PartModule cachePartModule = GetModule<ModuleEngines>(part);
if (cachePartModule != null)
{
return (cachePartModule as ModuleEngines).maxThrust;
@@ -123,20 +141,18 @@
return 0.0;
}
+ */
/// <summary>
/// Gets the first typed PartModule in the part's module list.
/// </summary>
public static T GetModule<T>(this Part part) where T : PartModule
{
- PartModule partModule;
- for (int i = 0; i < part.Modules.Count; ++i)
- {
- partModule = part.Modules[i];
- if (partModule is T)
- {
- return partModule as T;
- }
+ for (int i = 0; i < part.Modules.Count; i++)
+ {
+ PartModule pm = part.Modules[i];
+ if (pm is T)
+ return (T)pm;
}
return null;
}
@@ -181,10 +197,10 @@
return GetModule<ModuleEngines>(part);
}
- public static ModuleEnginesFX GetModuleEnginesFx(this Part part)
+/* public static ModuleEnginesFX GetModuleEnginesFx(this Part part)
{
return GetModule<ModuleEnginesFX>(part);
- }
+ }*/
/// <summary>
/// Gets a ModuleGenerator typed PartModule.
@@ -205,16 +221,20 @@
/// <summary>
/// Gets the current selected ModuleEnginesFX.
/// </summary>
- public static ModuleEnginesFX GetModuleMultiModeEngine(this Part part)
- {
- ModuleEnginesFX moduleEngineFx;
- string mode = GetModule<MultiModeEngine>(part).mode;
- for (int i = 0; i < part.Modules.Count; ++i)
- {
- moduleEngineFx = part.Modules[i] as ModuleEnginesFX;
- if (moduleEngineFx != null && moduleEngineFx.engineID == mode)
- {
- return moduleEngineFx;
+ public static ModuleEngines GetModuleMultiModeEngine(this Part part)
+ {
+ ModuleEngines moduleEngines;
+ MultiModeEngine multiMod = GetModule<MultiModeEngine>(part);
+ if (multiMod != null)
+ {
+ string mode = multiMod.mode;
+ for (int i = 0; i < part.Modules.Count; ++i)
+ {
+ moduleEngines = part.Modules[i] as ModuleEngines;
+ if (moduleEngines != null && moduleEngines.engineID == mode)
+ {
+ return moduleEngines;
+ }
}
}
return null;
@@ -252,7 +272,7 @@
public static ProtoModuleDecoupler GetProtoModuleDecoupler(this Part part)
{
- cachePartModule = GetModule<ModuleDecouple>(part);
+ PartModule cachePartModule = GetModule<ModuleDecouple>(part);
if (cachePartModule == null)
{
cachePartModule = GetModule<ModuleAnchoredDecoupler>(part);
@@ -270,7 +290,7 @@
/// </summary>
public static ProtoModuleEngine GetProtoModuleEngine(this Part part)
{
- cachePartModule = GetModule<ModuleEngines>(part);
+ PartModule cachePartModule = GetModule<ModuleEngines>(part);
if (cachePartModule != null)
{
return new ProtoModuleEngine(cachePartModule);
@@ -293,7 +313,7 @@
double cost = 0.0;
for (int i = 0; i < part.Resources.list.Count; ++i)
{
- cachePartResource = part.Resources.list[i];
+ PartResource cachePartResource = part.Resources.list[i];
cost = cost + (cachePartResource.amount * cachePartResource.info.unitCost);
}
return cost;
@@ -303,36 +323,37 @@
/// Gets the cost of the part's contained resources, inverted.
/// </summary>
public static double GetResourceCostInverted(this Part part)
+ {
+ double sum = 0;
+ for (int i = 0; i < part.Resources.list.Count; i++)
+ {
+ PartResource r = part.Resources.list[i];
+ sum += (r.maxAmount - r.amount) * r.info.unitCost;
+ }
+ return sum;
+ }
+
+ /// <summary>
+ /// Gets the cost of the part's maximum contained resources.
+ /// </summary>
+ public static double GetResourceCostMax(this Part part)
{
double cost = 0.0;
for (int i = 0; i < part.Resources.list.Count; ++i)
{
- cachePartResource = part.Resources.list[i];
- cost = cost + ((cachePartResource.maxAmount - cachePartResource.amount) * cachePartResource.info.unitCost);
+ PartResource cachePartResource = part.Resources.list[i];
+ cost = cost + (cachePartResource.maxAmount * cachePartResource.info.unitCost);
}
return cost;
}
/// <summary>
- /// Gets the cost of the part's maximum contained resources.
- /// </summary>
- public static double GetResourceCostMax(this Part part)
- {
- double cost = 0.0;
- for (int i = 0; i < part.Resources.list.Count; ++i)
- {
- cachePartResource = part.Resources.list[i];
- cost = cost + (cachePartResource.maxAmount * cachePartResource.info.unitCost);
- }
- return cost;
- }
-
- /// <summary>
/// Gets the current specific impulse for the engine.
/// </summary>
+ /* not used
public static double GetSpecificImpulse(this Part part, float atmosphere)
{
- cachePartModule = GetModule<ModuleEngines>(part);
+ PartModule cachePartModule = GetModule<ModuleEngines>(part);
if (cachePartModule != null)
{
return (cachePartModule as ModuleEngines).atmosphereCurve.Evaluate(atmosphere);
@@ -346,6 +367,7 @@
return 0.0;
}
+ */
/// <summary>
/// Gets the total mass of the part including resources.
@@ -360,12 +382,10 @@
/// </summary>
public static bool HasModule<T>(this Part part) where T : PartModule
{
- for (int i = 0; i < part.Modules.Count; ++i)
+ for (int i = 0; i < part.Modules.Count; i++)
{
if (part.Modules[i] is T)
- {
return true;
- }
}
return false;
}
@@ -375,13 +395,11 @@
/// </summary>
public static bool HasModule<T>(this Part part, Func<T, bool> predicate) where T : PartModule
{
- for (int i = 0; i < part.Modules.Count; ++i)
- {
- cachePartModule = part.Modules[i] as T;
- if (cachePartModule != null && predicate(cachePartModule as T))
- {
+ for (int i = 0; i < part.Modules.Count; i++)
+ {
+ PartModule pm = part.Modules[i];
+ if (pm is T && predicate(pm as T))
return true;
- }
}
return false;
}
@@ -407,7 +425,7 @@
/// </summary>
public static bool HasOneShotAnimation(this Part part)
{
- cachePartModule = GetModule<ModuleAnimateGeneric>(part);
+ PartModule cachePartModule = GetModule<ModuleAnimateGeneric>(part);
return cachePartModule != null && (cachePartModule as ModuleAnimateGeneric).isOneShot;
}
@@ -448,7 +466,7 @@
/// </summary>
public static bool IsEngine(this Part part)
{
- return HasModule<ModuleEngines>(part) || HasModule<ModuleEnginesFX>(part);
+ return HasModule<ModuleEngines>(part);
}
/// <summary>
@@ -488,15 +506,14 @@
/// </summary>
public static bool IsPrimary(this Part part, List<Part> partsList, PartModule module)
{
- for (int i = 0; i < partsList.Count; ++i)
- {
- cachePart = partsList[i];
-
- if (HasModule(cachePart, module.ClassID) == false)
+ for (int i = 0; i < partsList.Count; i++)
+ {
+ var vesselPart = partsList[i];
+ if (!vesselPart.HasModule(module.ClassID))
{
continue;
}
- if (cachePart == part)
+ if (vesselPart == part)
{
return true;
}
@@ -532,7 +549,7 @@
/// </summary>
public static bool IsSolidRocket(this Part part)
{
- return (HasModule<ModuleEngines>(part) && GetModuleEngines(part).throttleLocked) || (HasModule<ModuleEnginesFX>(part) && GetModuleEnginesFx(part).throttleLocked);
+ return (part.HasModule<ModuleEngines>() && part.GetModuleEngines().throttleLocked);
}
public class ProtoModuleDecoupler
@@ -580,6 +597,12 @@
}
}
+ // This needs updating to handle multi-mode engines and engines with multiple ModuleEngines correctly.
+ // It currently just shows the stats of the currently active module for multi-mode engines and just
+ // the first ModuleEngines for engines with multiple modules.
+ // It should really show all the modes for multi-mode engines as separate sections.
+ // For other engines with multiple ModuleEngines it should combine the separate modules into a single set of data
+ // The constructor should be changed to take the Part itself. It can be called if HasModule<ModuleEngines>() is true.
public class ProtoModuleEngine
{
private readonly PartModule module;
@@ -619,19 +642,6 @@
MinimumThrust = engine.minThrust;
Propellants = engine.propellants;
}
-
- private void SetModuleEnginesFx()
- {
- ModuleEnginesFX engine = module as ModuleEnginesFX;
- if (engine == null)
- {
- return;
- }
-
- MaximumThrust = engine.maxThrust * (engine.thrustPercentage * 0.01);
- MinimumThrust = engine.minThrust;
- Propellants = engine.propellants;
- }
}
}
}
--- /dev/null
+++ b/KerbalEngineer/Extensions/StringExtensions.cs
@@ -1,1 +1,33 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Extensions
+{
+ public static class StringExtensions
+ {
+ public static string ToLength(this string value, int length)
+ {
+ if (value != null && value.Length > length)
+ {
+ value = value.Substring(0, length) + "...";
+ }
+ return value;
+ }
+ }
+}
--- a/KerbalEngineer/Flight/DisplayStack.cs
+++ b/KerbalEngineer/Flight/DisplayStack.cs
@@ -214,7 +214,7 @@
/// </summary>
private void DrawControlBar()
{
- GUILayout.Label("FLIGHT ENGINEER " + EngineerGlobals.AssemblyVersion, this.titleStyle);
+ GUILayout.Label("FLIGHT ENGINEER " + EngineerGlobals.ASSEMBLY_VERSION, this.titleStyle);
this.DrawControlBarButtons(SectionLibrary.StockSections);
this.DrawControlBarButtons(SectionLibrary.CustomSections);
--- a/KerbalEngineer/Flight/Readouts/Orbital/Eccentricity.cs
+++ b/KerbalEngineer/Flight/Readouts/Orbital/Eccentricity.cs
@@ -43,7 +43,7 @@
public override void Draw(SectionModule section)
{
- this.DrawLine(FlightGlobals.ship_orbit.eccentricity.ToString("F3"), section.IsHud);
+ this.DrawLine(FlightGlobals.ship_orbit.eccentricity.ToString("F5"), section.IsHud);
}
#endregion
--- a/KerbalEngineer/Flight/Readouts/Orbital/ManoeuvreNode/ManoeuvreProcessor.cs
+++ b/KerbalEngineer/Flight/Readouts/Orbital/ManoeuvreNode/ManoeuvreProcessor.cs
@@ -30,6 +30,8 @@
namespace KerbalEngineer.Flight.Readouts.Orbital.ManoeuvreNode
{
+ using Helpers;
+
public class ManoeuvreProcessor : IUpdatable, IUpdateRequest
{
#region Fields
@@ -163,7 +165,7 @@
deltaVDrain = deltaV.Clamp(0.0, stageDeltaV);
}
- var exhaustVelocity = stage.isp * 9.82;
+ var exhaustVelocity = stage.isp * Units.GRAVITY;
var flowRate = stage.thrust / exhaustVelocity;
var endMass = Math.Exp(Math.Log(startMass) - deltaVDrain / exhaustVelocity);
var deltaMass = (startMass - endMass) * Math.Exp(-(deltaVDrain * 0.001) / exhaustVelocity);
--- a/KerbalEngineer/Flight/Readouts/ReadoutLibrary.cs
+++ b/KerbalEngineer/Flight/Readouts/ReadoutLibrary.cs
@@ -1,7 +1,5 @@
//
-// Kerbal Engineer Redux
-//
-// Copyright (C) 2014 CYBUTEK
+// Copyright (C) 2015 CYBUTEK
//
// 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
@@ -19,8 +17,6 @@
namespace KerbalEngineer.Flight.Readouts
{
- #region Using Directives
-
using System;
using System.Collections.Generic;
using System.Linq;
@@ -30,6 +26,7 @@
using Rendezvous;
using Settings;
using Surface;
+ using Thermal;
using Vessel;
using AltitudeSeaLevel = Surface.AltitudeSeaLevel;
using ApoapsisHeight = Orbital.ApoapsisHeight;
@@ -40,17 +37,9 @@
using TimeToApoapsis = Orbital.TimeToApoapsis;
using TimeToPeriapsis = Orbital.TimeToPeriapsis;
- #endregion
-
public static class ReadoutLibrary
{
- #region Fields
-
private static List<ReadoutModule> readouts = new List<ReadoutModule>();
-
- #endregion
-
- #region Constructors
/// <summary>
/// Sets up and populates the readout library with the stock readouts.
@@ -63,6 +52,7 @@
ReadoutCategory.SetCategory("Surface", "Surface and atmospheric readouts.");
ReadoutCategory.SetCategory("Vessel", "Vessel performance statistics.");
ReadoutCategory.SetCategory("Rendezvous", "Readouts for rendezvous manovoeures.");
+ ReadoutCategory.SetCategory("Thermal", "Thermal characteristics readouts.");
ReadoutCategory.SetCategory("Miscellaneous", "Miscellaneous readouts.");
ReadoutCategory.Selected = ReadoutCategory.GetCategory("Orbital");
@@ -109,6 +99,7 @@
readouts.Add(new VerticalAcceleration());
readouts.Add(new HorizontalSpeed());
readouts.Add(new HorizontalAcceleration());
+ readouts.Add(new MachNumber());
readouts.Add(new Latitude());
readouts.Add(new Longitude());
readouts.Add(new GeeForce());
@@ -171,7 +162,22 @@
readouts.Add(new Rendezvous.OrbitalPeriod());
readouts.Add(new Rendezvous.SemiMajorAxis());
readouts.Add(new Rendezvous.SemiMinorAxis());
-
+
+ // Thermal
+ readouts.Add(new InternalFlux());
+ readouts.Add(new ConvectionFlux());
+ readouts.Add(new RadiationFlux());
+ readouts.Add(new CriticalPart());
+ readouts.Add(new CriticalTemperature());
+ readouts.Add(new CriticalSkinTemperature());
+ readouts.Add(new CriticalThermalPercentage());
+ readouts.Add(new HottestPart());
+ readouts.Add(new HottestTemperature());
+ readouts.Add(new HottestSkinTemperature());
+ readouts.Add(new CoolestPart());
+ readouts.Add(new CoolestTemperature());
+ readouts.Add(new CoolestSkinTemperature());
+
// Misc
readouts.Add(new Separator());
readouts.Add(new GuiSizeAdjustor());
@@ -188,22 +194,20 @@
}
}
- #endregion
-
- #region Properties
-
/// <summary>
/// Gets and sets the available readout modules.
/// </summary>
public static List<ReadoutModule> Readouts
{
- get { return readouts; }
- set { readouts = value; }
- }
-
- #endregion
-
- #region Methods
+ get
+ {
+ return readouts;
+ }
+ set
+ {
+ readouts = value;
+ }
+ }
/// <summary>
/// Gets a list of readout modules which are associated with the specified category.
@@ -226,7 +230,7 @@
/// </summary>
public static void Reset()
{
- foreach (var readout in readouts)
+ foreach (ReadoutModule readout in readouts)
{
readout.Reset();
}
@@ -239,8 +243,8 @@
{
try
{
- var handler = SettingHandler.Load("HelpStrings.xml");
- foreach (var readout in readouts)
+ SettingHandler handler = SettingHandler.Load("HelpStrings.xml");
+ foreach (ReadoutModule readout in readouts)
{
readout.HelpString = handler.GetSet(readout.Category + "." + readout.GetType().Name, readout.HelpString);
}
@@ -251,7 +255,5 @@
Logger.Exception(ex);
}
}
-
- #endregion
}
}
--- a/KerbalEngineer/Flight/Readouts/ReadoutModule.cs
+++ b/KerbalEngineer/Flight/Readouts/ReadoutModule.cs
@@ -29,6 +29,8 @@
namespace KerbalEngineer.Flight.Readouts
{
+ using Extensions;
+
public abstract class ReadoutModule
{
#region Fields
@@ -178,13 +180,13 @@
{
GUILayout.Label(this.Name, this.NameStyle);
GUILayout.FlexibleSpace();
- GUILayout.Label(value, this.ValueStyle);
+ GUILayout.Label(value.ToLength(20), this.ValueStyle);
}
else
{
GUILayout.Label(this.Name, this.NameStyle, GUILayout.Height(this.NameStyle.fontSize * 1.2f));
GUILayout.FlexibleSpace();
- GUILayout.Label(value, this.ValueStyle, GUILayout.Height(this.ValueStyle.fontSize * 1.2f));
+ GUILayout.Label(value.ToLength(20), this.ValueStyle, GUILayout.Height(this.ValueStyle.fontSize * 1.2f));
}
GUILayout.EndHorizontal();
@@ -198,13 +200,13 @@
{
GUILayout.Label(name, this.NameStyle);
GUILayout.FlexibleSpace();
- GUILayout.Label(value, this.ValueStyle);
+ GUILayout.Label(value.ToLength(20), this.ValueStyle);
}
else
{
GUILayout.Label(name, this.NameStyle, GUILayout.Height(this.NameStyle.fontSize * 1.2f));
GUILayout.FlexibleSpace();
- GUILayout.Label(value, this.ValueStyle, GUILayout.Height(this.ValueStyle.fontSize * 1.2f));
+ GUILayout.Label(value.ToLength(20), this.ValueStyle, GUILayout.Height(this.ValueStyle.fontSize * 1.2f));
}
GUILayout.EndHorizontal();
--- a/KerbalEngineer/Flight/Readouts/Rendezvous/RendezvousProcessor.cs
+++ b/KerbalEngineer/Flight/Readouts/Rendezvous/RendezvousProcessor.cs
@@ -1,7 +1,7 @@
//
// Kerbal Engineer Redux
//
-// Copyright (C) 2014 CYBUTEK
+// Copyright (C) 2015 CYBUTEK
//
// 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
@@ -17,30 +17,19 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
-#region Using Directives
-
-using System;
-
-using KerbalEngineer.Extensions;
-using KerbalEngineer.Helpers;
-
-#endregion
-
namespace KerbalEngineer.Flight.Readouts.Rendezvous
{
+ using System;
+ using Extensions;
+ using Helpers;
+
public class RendezvousProcessor : IUpdatable, IUpdateRequest
{
- #region Fields
-
private static readonly RendezvousProcessor instance = new RendezvousProcessor();
private Orbit originOrbit;
private Orbit targetOrbit;
- #endregion
-
- #region Properties
-
/// <summary>
/// Gets the target's altitude above its reference body.
/// </summary>
@@ -71,7 +60,10 @@
/// </summary>
public static RendezvousProcessor Instance
{
- get { return instance; }
+ get
+ {
+ return instance;
+ }
}
/// <summary>
@@ -149,10 +141,6 @@
/// </summary>
public bool UpdateRequested { get; set; }
- #endregion
-
- #region Methods: public
-
/// <summary>
/// Request and update to calculate the details.
/// </summary>
@@ -166,7 +154,13 @@
/// </summary>
public void Update()
{
- if (FlightGlobals.fetch.VesselTarget == null)
+ if (FlightGlobals.fetch == null ||
+ FlightGlobals.fetch.VesselTarget == null ||
+ FlightGlobals.ActiveVessel == null ||
+ FlightGlobals.ActiveVessel.targetObject == null ||
+ FlightGlobals.ActiveVessel.targetObject.GetOrbit() == null ||
+ FlightGlobals.ship_orbit == null ||
+ FlightGlobals.ship_orbit.referenceBody == null)
{
ShowDetails = false;
return;
@@ -174,55 +168,50 @@
ShowDetails = true;
- this.targetOrbit = FlightGlobals.fetch.VesselTarget.GetOrbit();
- this.originOrbit = (FlightGlobals.ship_orbit.referenceBody == Planetarium.fetch.Sun || FlightGlobals.ship_orbit.referenceBody == FlightGlobals.ActiveVessel.targetObject.GetOrbit().referenceBody)
+ targetOrbit = FlightGlobals.fetch.VesselTarget.GetOrbit();
+ originOrbit = (FlightGlobals.ship_orbit.referenceBody == Planetarium.fetch.Sun ||
+ FlightGlobals.ship_orbit.referenceBody == FlightGlobals.ActiveVessel.targetObject.GetOrbit().referenceBody)
? FlightGlobals.ship_orbit
: FlightGlobals.ship_orbit.referenceBody.orbit;
- RelativeInclination = this.originOrbit.GetRelativeInclination(this.targetOrbit);
+ RelativeInclination = originOrbit.GetRelativeInclination(targetOrbit);
RelativeVelocity = FlightGlobals.ship_tgtSpeed;
- RelativeSpeed = FlightGlobals.ship_obtSpeed - this.targetOrbit.orbitalSpeed;
- PhaseAngle = this.originOrbit.GetPhaseAngle(this.targetOrbit);
- InterceptAngle = this.CalcInterceptAngle();
- TimeToAscendingNode = this.originOrbit.GetTimeToVector(this.GetAscendingNode());
- TimeToDescendingNode = this.originOrbit.GetTimeToVector(this.GetDescendingNode());
- AngleToAscendingNode = this.originOrbit.GetAngleToVector(this.GetAscendingNode());
- AngleToDescendingNode = this.originOrbit.GetAngleToVector(this.GetDescendingNode());
- AltitudeSeaLevel = this.targetOrbit.altitude;
- ApoapsisHeight = this.targetOrbit.ApA;
- PeriapsisHeight = this.targetOrbit.PeA;
- TimeToApoapsis = this.targetOrbit.timeToAp;
- TimeToPeriapsis = this.targetOrbit.timeToPe;
- SemiMajorAxis = this.targetOrbit.semiMajorAxis;
- SemiMinorAxis = this.targetOrbit.semiMinorAxis;
-
- Distance = Vector3d.Distance(this.targetOrbit.pos, this.originOrbit.pos);
- OrbitalPeriod = this.targetOrbit.period;
- }
-
- #endregion
-
- #region Methods: private
+ RelativeSpeed = FlightGlobals.ship_obtSpeed - targetOrbit.orbitalSpeed;
+ PhaseAngle = originOrbit.GetPhaseAngle(targetOrbit);
+ InterceptAngle = CalcInterceptAngle();
+ TimeToAscendingNode = originOrbit.GetTimeToVector(GetAscendingNode());
+ TimeToDescendingNode = originOrbit.GetTimeToVector(GetDescendingNode());
+ AngleToAscendingNode = originOrbit.GetAngleToVector(GetAscendingNode());
+ AngleToDescendingNode = originOrbit.GetAngleToVector(GetDescendingNode());
+ AltitudeSeaLevel = targetOrbit.altitude;
+ ApoapsisHeight = targetOrbit.ApA;
+ PeriapsisHeight = targetOrbit.PeA;
+ TimeToApoapsis = targetOrbit.timeToAp;
+ TimeToPeriapsis = targetOrbit.timeToPe;
+ SemiMajorAxis = targetOrbit.semiMajorAxis;
+ SemiMinorAxis = targetOrbit.semiMinorAxis;
+
+ Distance = Vector3d.Distance(targetOrbit.pos, originOrbit.pos);
+ OrbitalPeriod = targetOrbit.period;
+ }
private double CalcInterceptAngle()
{
- var originRadius = (this.originOrbit.semiMinorAxis + this.originOrbit.semiMajorAxis) * 0.5;
- var targetRadius = (this.targetOrbit.semiMinorAxis + this.targetOrbit.semiMajorAxis) * 0.5;
- var angle = 180.0 * (1.0 - Math.Pow((originRadius + targetRadius) / (2.0 * targetRadius), 1.5));
+ double originRadius = (originOrbit.semiMinorAxis + originOrbit.semiMajorAxis) * 0.5;
+ double targetRadius = (targetOrbit.semiMinorAxis + targetOrbit.semiMajorAxis) * 0.5;
+ double angle = 180.0 * (1.0 - Math.Pow((originRadius + targetRadius) / (2.0 * targetRadius), 1.5));
angle = PhaseAngle - angle;
return RelativeInclination < 90.0 ? AngleHelper.Clamp360(angle) : AngleHelper.Clamp360(360.0 - (180.0 - angle));
}
private Vector3d GetAscendingNode()
{
- return Vector3d.Cross(this.targetOrbit.GetOrbitNormal(), this.originOrbit.GetOrbitNormal());
+ return Vector3d.Cross(targetOrbit.GetOrbitNormal(), originOrbit.GetOrbitNormal());
}
private Vector3d GetDescendingNode()
{
- return Vector3d.Cross(this.originOrbit.GetOrbitNormal(), this.targetOrbit.GetOrbitNormal());
- }
-
- #endregion
+ return Vector3d.Cross(originOrbit.GetOrbitNormal(), targetOrbit.GetOrbitNormal());
+ }
}
}
--- a/KerbalEngineer/Flight/Readouts/Surface/AtmosphericEfficiency.cs
+++ b/KerbalEngineer/Flight/Readouts/Surface/AtmosphericEfficiency.cs
@@ -1,7 +1,7 @@
//
// Kerbal Engineer Redux
//
-// Copyright (C) 2014 CYBUTEK
+// Copyright (C) 2015 CYBUTEK
//
// 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
@@ -17,36 +17,26 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
-#region Using Directives
-
-using KerbalEngineer.Extensions;
-using KerbalEngineer.Flight.Sections;
-
-#endregion
-
namespace KerbalEngineer.Flight.Readouts.Surface
{
+ using Extensions;
+ using Sections;
+
public class AtmosphericEfficiency : ReadoutModule
{
- #region Constructors
-
public AtmosphericEfficiency()
{
- this.Name = "Atmos. Efficiency";
- this.Category = ReadoutCategory.GetCategory("Surface");
- this.HelpString = "Shows you vessel's efficiency as a ratio of the current velocity and terminal velocity. Less than 1 means that you are losing efficiency due to gravity and greater than 1 is due to drag.";
- this.IsDefault = true;
+ Name = "Atmos. Efficiency";
+ Category = ReadoutCategory.GetCategory("Surface");
+ HelpString = "Shows you vessel's efficiency as a ratio of the current velocity and terminal velocity. Less than 100% means that you are losing efficiency due to gravity and greater than 100% is due to drag.";
+ IsDefault = false;
}
-
- #endregion
-
- #region Methods: public
public override void Draw(SectionModule section)
{
if (AtmosphericProcessor.ShowDetails)
{
- this.DrawLine(AtmosphericProcessor.Efficiency.ToPercent(), section.IsHud);
+ DrawLine(AtmosphericProcessor.Efficiency.ToPercent(), section.IsHud);
}
}
@@ -59,7 +49,5 @@
{
AtmosphericProcessor.RequestUpdate();
}
-
- #endregion
}
}
--- a/KerbalEngineer/Flight/Readouts/Surface/Latitude.cs
+++ b/KerbalEngineer/Flight/Readouts/Surface/Latitude.cs
@@ -20,6 +20,7 @@
#region Using Directives
using KerbalEngineer.Flight.Sections;
+using KerbalEngineer.Helpers;
#endregion
@@ -43,7 +44,7 @@
public override void Draw(SectionModule section)
{
- this.DrawLine(KSPUtil.PrintLatitude(FlightGlobals.ship_latitude), section.IsHud);
+ this.DrawLine(Units.ToAngleDMS(FlightGlobals.ship_latitude) + (FlightGlobals.ship_latitude < 0 ? " S" : " N"), section.IsHud);
}
#endregion
--- a/KerbalEngineer/Flight/Readouts/Surface/Longitude.cs
+++ b/KerbalEngineer/Flight/Readouts/Surface/Longitude.cs
@@ -17,35 +17,25 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
-#region Using Directives
-
-using KerbalEngineer.Flight.Sections;
-
-#endregion
-
namespace KerbalEngineer.Flight.Readouts.Surface
{
+ using Helpers;
+ using Sections;
+
public class Longitude : ReadoutModule
{
- #region Constructors
-
public Longitude()
{
- this.Name = "Longitude";
- this.Category = ReadoutCategory.GetCategory("Surface");
- this.HelpString = "Shows the vessel's longitude around a celestial body. Longitude is the angle from the bodies prime meridian.";
- this.IsDefault = true;
+ Name = "Longitude";
+ Category = ReadoutCategory.GetCategory("Surface");
+ HelpString = "Shows the vessel's longitude around a celestial body. Longitude is the angle from the bodies prime meridian.";
+ IsDefault = true;
}
-
- #endregion
-
- #region Methods: public
public override void Draw(SectionModule section)
{
- this.DrawLine(KSPUtil.PrintLongitude(FlightGlobals.ship_longitude), section.IsHud);
+ double angle = AngleHelper.Clamp180(FlightGlobals.ship_longitude);
+ DrawLine(Units.ToAngleDMS(angle) + (angle < 0.0 ? "W" : " E"), section.IsHud);
}
-
- #endregion
}
}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Surface/MachNumber.cs
@@ -1,1 +1,43 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Surface
+{
+ using Extensions;
+ using Sections;
+
+ public class MachNumber : ReadoutModule
+ {
+ public MachNumber()
+ {
+ Name = "Mach Number";
+ Category = ReadoutCategory.GetCategory("Surface");
+ HelpString = "Shows the vessel's mach number.";
+ IsDefault = true;
+ }
+
+ public override void Draw(SectionModule section)
+ {
+ if (FlightGlobals.ActiveVessel.atmDensity > 0.0)
+ {
+ DrawLine(FlightGlobals.ActiveVessel.mach.ToMach(), section.IsHud);
+ }
+ }
+ }
+}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Thermal/ConvectionFlux.cs
@@ -1,1 +1,53 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Thermal
+{
+ using Extensions;
+ using Sections;
+
+ public class ConvectionFlux : ReadoutModule
+ {
+ public ConvectionFlux()
+ {
+ Name = "Convection Flux";
+ Category = ReadoutCategory.GetCategory("Thermal");
+ HelpString = string.Empty;
+ IsDefault = true;
+ }
+
+ public override void Draw(SectionModule section)
+ {
+ if (ThermalProcessor.ShowDetails && FlightGlobals.ActiveVessel.atmDensity > 0.0)
+ {
+ DrawLine(ThermalProcessor.ConvectionFlux.ToFlux(), section.IsHud);
+ }
+ }
+
+ public override void Reset()
+ {
+ FlightEngineerCore.Instance.AddUpdatable(ThermalProcessor.Instance);
+ }
+
+ public override void Update()
+ {
+ ThermalProcessor.RequestUpdate();
+ }
+ }
+}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Thermal/CoolestPart.cs
@@ -1,1 +1,52 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Thermal
+{
+ using Sections;
+
+ public class CoolestPart : ReadoutModule
+ {
+ public CoolestPart()
+ {
+ Name = "Coolest Part";
+ Category = ReadoutCategory.GetCategory("Thermal");
+ HelpString = string.Empty;
+ IsDefault = true;
+ }
+
+ public override void Draw(SectionModule section)
+ {
+ if (ThermalProcessor.ShowDetails)
+ {
+ DrawLine(ThermalProcessor.CoolestPartName, section.IsHud);
+ }
+ }
+
+ public override void Reset()
+ {
+ FlightEngineerCore.Instance.AddUpdatable(ThermalProcessor.Instance);
+ }
+
+ public override void Update()
+ {
+ ThermalProcessor.RequestUpdate();
+ }
+ }
+}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Thermal/CoolestSkinTemperature.cs
@@ -1,1 +1,53 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Thermal
+{
+ using Helpers;
+ using Sections;
+
+ public class CoolestSkinTemperature : ReadoutModule
+ {
+ public CoolestSkinTemperature()
+ {
+ Name = "Coolest Skin Temperature";
+ Category = ReadoutCategory.GetCategory("Thermal");
+ HelpString = string.Empty;
+ IsDefault = true;
+ }
+
+ public override void Draw(SectionModule section)
+ {
+ if (ThermalProcessor.ShowDetails)
+ {
+ DrawLine(Units.ToTemperature(ThermalProcessor.CoolestSkinTemperature, ThermalProcessor.CoolestSkinTemperatureMax), section.IsHud);
+ }
+ }
+
+ public override void Reset()
+ {
+ FlightEngineerCore.Instance.AddUpdatable(ThermalProcessor.Instance);
+ }
+
+ public override void Update()
+ {
+ ThermalProcessor.RequestUpdate();
+ }
+ }
+}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Thermal/CoolestTemperature.cs
@@ -1,1 +1,53 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Thermal
+{
+ using Helpers;
+ using Sections;
+
+ public class CoolestTemperature : ReadoutModule
+ {
+ public CoolestTemperature()
+ {
+ Name = "Coolest Temperature";
+ Category = ReadoutCategory.GetCategory("Thermal");
+ HelpString = string.Empty;
+ IsDefault = true;
+ }
+
+ public override void Draw(SectionModule section)
+ {
+ if (ThermalProcessor.ShowDetails)
+ {
+ DrawLine(Units.ToTemperature(ThermalProcessor.CoolestTemperature, ThermalProcessor.CoolestTemperatureMax), section.IsHud);
+ }
+ }
+
+ public override void Reset()
+ {
+ FlightEngineerCore.Instance.AddUpdatable(ThermalProcessor.Instance);
+ }
+
+ public override void Update()
+ {
+ ThermalProcessor.RequestUpdate();
+ }
+ }
+}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Thermal/CriticalPart.cs
@@ -1,1 +1,52 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Thermal
+{
+ using Sections;
+
+ public class CriticalPart : ReadoutModule
+ {
+ public CriticalPart()
+ {
+ Name = "Critical Part";
+ Category = ReadoutCategory.GetCategory("Thermal");
+ HelpString = string.Empty;
+ IsDefault = true;
+ }
+
+ public override void Draw(SectionModule section)
+ {
+ if (ThermalProcessor.ShowDetails)
+ {
+ DrawLine(ThermalProcessor.CriticalPartName, section.IsHud);
+ }
+ }
+
+ public override void Reset()
+ {
+ FlightEngineerCore.Instance.AddUpdatable(ThermalProcessor.Instance);
+ }
+
+ public override void Update()
+ {
+ ThermalProcessor.RequestUpdate();
+ }
+ }
+}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Thermal/CriticalSkinTemperature.cs
@@ -1,1 +1,53 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Thermal
+{
+ using Helpers;
+ using Sections;
+
+ public class CriticalSkinTemperature : ReadoutModule
+ {
+ public CriticalSkinTemperature()
+ {
+ Name = "Critical Skin Temperature";
+ Category = ReadoutCategory.GetCategory("Thermal");
+ HelpString = string.Empty;
+ IsDefault = true;
+ }
+
+ public override void Draw(SectionModule section)
+ {
+ if (ThermalProcessor.ShowDetails)
+ {
+ DrawLine(Units.ToTemperature(ThermalProcessor.CriticalSkinTemperature, ThermalProcessor.CriticalSkinTemperatureMax), section.IsHud);
+ }
+ }
+
+ public override void Reset()
+ {
+ FlightEngineerCore.Instance.AddUpdatable(ThermalProcessor.Instance);
+ }
+
+ public override void Update()
+ {
+ ThermalProcessor.RequestUpdate();
+ }
+ }
+}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Thermal/CriticalTemperature.cs
@@ -1,1 +1,53 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Thermal
+{
+ using Helpers;
+ using Sections;
+
+ public class CriticalTemperature : ReadoutModule
+ {
+ public CriticalTemperature()
+ {
+ Name = "Critical Temperature";
+ Category = ReadoutCategory.GetCategory("Thermal");
+ HelpString = string.Empty;
+ IsDefault = true;
+ }
+
+ public override void Draw(SectionModule section)
+ {
+ if (ThermalProcessor.ShowDetails)
+ {
+ DrawLine(Units.ToTemperature(ThermalProcessor.CriticalTemperature, ThermalProcessor.CriticalTemperatureMax), section.IsHud);
+ }
+ }
+
+ public override void Reset()
+ {
+ FlightEngineerCore.Instance.AddUpdatable(ThermalProcessor.Instance);
+ }
+
+ public override void Update()
+ {
+ ThermalProcessor.RequestUpdate();
+ }
+ }
+}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Thermal/CriticalThermalPercentage.cs
@@ -1,1 +1,53 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Thermal
+{
+ using Extensions;
+ using Sections;
+
+ public class CriticalThermalPercentage : ReadoutModule
+ {
+ public CriticalThermalPercentage()
+ {
+ Name = "Critical Thermal Percentage";
+ Category = ReadoutCategory.GetCategory("Thermal");
+ HelpString = string.Empty;
+ IsDefault = true;
+ }
+
+ public override void Draw(SectionModule section)
+ {
+ if (ThermalProcessor.ShowDetails)
+ {
+ DrawLine(ThermalProcessor.CriticalTemperaturePercentage.ToPercent(), section.IsHud);
+ }
+ }
+
+ public override void Reset()
+ {
+ FlightEngineerCore.Instance.AddUpdatable(ThermalProcessor.Instance);
+ }
+
+ public override void Update()
+ {
+ ThermalProcessor.RequestUpdate();
+ }
+ }
+}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Thermal/HottestPart.cs
@@ -1,1 +1,52 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Thermal
+{
+ using Sections;
+
+ public class HottestPart : ReadoutModule
+ {
+ public HottestPart()
+ {
+ Name = "Hottest Part";
+ Category = ReadoutCategory.GetCategory("Thermal");
+ HelpString = string.Empty;
+ IsDefault = true;
+ }
+
+ public override void Draw(SectionModule section)
+ {
+ if (ThermalProcessor.ShowDetails)
+ {
+ DrawLine(ThermalProcessor.HottestPartName, section.IsHud);
+ }
+ }
+
+ public override void Reset()
+ {
+ FlightEngineerCore.Instance.AddUpdatable(ThermalProcessor.Instance);
+ }
+
+ public override void Update()
+ {
+ ThermalProcessor.RequestUpdate();
+ }
+ }
+}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Thermal/HottestSkinTemperature.cs
@@ -1,1 +1,53 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Thermal
+{
+ using Helpers;
+ using Sections;
+
+ public class HottestSkinTemperature : ReadoutModule
+ {
+ public HottestSkinTemperature()
+ {
+ Name = "Hottest Skin Temperature";
+ Category = ReadoutCategory.GetCategory("Thermal");
+ HelpString = string.Empty;
+ IsDefault = true;
+ }
+
+ public override void Draw(SectionModule section)
+ {
+ if (ThermalProcessor.ShowDetails)
+ {
+ DrawLine(Units.ToTemperature(ThermalProcessor.HottestSkinTemperature, ThermalProcessor.HottestSkinTemperatureMax), section.IsHud);
+ }
+ }
+
+ public override void Reset()
+ {
+ FlightEngineerCore.Instance.AddUpdatable(ThermalProcessor.Instance);
+ }
+
+ public override void Update()
+ {
+ ThermalProcessor.RequestUpdate();
+ }
+ }
+}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Thermal/HottestTemperature.cs
@@ -1,1 +1,53 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Thermal
+{
+ using Helpers;
+ using Sections;
+
+ public class HottestTemperature : ReadoutModule
+ {
+ public HottestTemperature()
+ {
+ Name = "Hottest Temperature";
+ Category = ReadoutCategory.GetCategory("Thermal");
+ HelpString = string.Empty;
+ IsDefault = true;
+ }
+
+ public override void Draw(SectionModule section)
+ {
+ if (ThermalProcessor.ShowDetails)
+ {
+ DrawLine(Units.ToTemperature(ThermalProcessor.HottestTemperature, ThermalProcessor.HottestTemperatureMax), section.IsHud);
+ }
+ }
+
+ public override void Reset()
+ {
+ FlightEngineerCore.Instance.AddUpdatable(ThermalProcessor.Instance);
+ }
+
+ public override void Update()
+ {
+ ThermalProcessor.RequestUpdate();
+ }
+ }
+}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Thermal/InternalFlux.cs
@@ -1,1 +1,53 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Thermal
+{
+ using Extensions;
+ using Sections;
+
+ public class InternalFlux : ReadoutModule
+ {
+ public InternalFlux()
+ {
+ Name = "Internal Flux";
+ Category = ReadoutCategory.GetCategory("Thermal");
+ HelpString = string.Empty;
+ IsDefault = true;
+ }
+
+ public override void Draw(SectionModule section)
+ {
+ if (ThermalProcessor.ShowDetails)
+ {
+ DrawLine(ThermalProcessor.InternalFlux.ToFlux(), section.IsHud);
+ }
+ }
+
+ public override void Reset()
+ {
+ FlightEngineerCore.Instance.AddUpdatable(ThermalProcessor.Instance);
+ }
+
+ public override void Update()
+ {
+ ThermalProcessor.RequestUpdate();
+ }
+ }
+}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Thermal/RadiationFlux.cs
@@ -1,1 +1,53 @@
+//
+// Kerbal Engineer Redux
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Thermal
+{
+ using Extensions;
+ using Sections;
+
+ public class RadiationFlux : ReadoutModule
+ {
+ public RadiationFlux()
+ {
+ Name = "Radiation Flux";
+ Category = ReadoutCategory.GetCategory("Thermal");
+ HelpString = string.Empty;
+ IsDefault = true;
+ }
+
+ public override void Draw(SectionModule section)
+ {
+ if (ThermalProcessor.ShowDetails)
+ {
+ DrawLine(ThermalProcessor.RadiationFlux.ToFlux(), section.IsHud);
+ }
+ }
+
+ public override void Reset()
+ {
+ FlightEngineerCore.Instance.AddUpdatable(ThermalProcessor.Instance);
+ }
+
+ public override void Update()
+ {
+ ThermalProcessor.RequestUpdate();
+ }
+ }
+}
--- /dev/null
+++ b/KerbalEngineer/Flight/Readouts/Thermal/ThermalProcessor.cs
@@ -1,1 +1,161 @@
+//
+// Copyright (C) 2015 CYBUTEK
+//
+// 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/>.
+//
+namespace KerbalEngineer.Flight.Readouts.Thermal
+{
+ using System;
+
+ public class ThermalProcessor : IUpdatable, IUpdateRequest
+ {
+ private static readonly ThermalProcessor instance = new ThermalProcessor();
+
+ static ThermalProcessor()
+ {
+ HottestTemperature = 0.0;
+ HottestTemperatureMax = 0.0;
+ HottestSkinTemperature = 0.0;
+ HottestSkinTemperatureMax = 0.0;
+ CoolestTemperature = 0.0;
+ CoolestTemperatureMax = 0.0;
+ CoolestSkinTemperature = 0.0;
+ CoolestSkinTemperatureMax = 0.0;
+ CriticalTemperature = 0.0;
+ CriticalTemperatureMax = 0.0;
+ CriticalSkinTemperature = 0.0;
+ CriticalSkinTemperatureMax = 0.0;
+ HottestPartName = string.Empty;
+ CoolestPartName = string.Empty;
+ CriticalPartName = string.Empty;
+ }
+
+ public static double ConvectionFlux { get; private set; }
+
+ public static string CoolestPartName { get; private set; }
+
+ public static double CoolestSkinTemperature { get; private set; }
+
+ public static double CoolestSkinTemperatureMax { get; private set; }
+
+ public static double CoolestTemperature { get; private set; }
+
+ public static double CoolestTemperatureMax { get; private set; }
+
+ public static string CriticalPartName { get; private set; }
+
+ public static double CriticalSkinTemperature { get; private set; }
+
+ public static double CriticalSkinTemperatureMax { get; private set; }
+
+ public static double CriticalTemperature { get; private set; }
+
+ public static double CriticalTemperatureMax { get; private set; }
+
+ public static double CriticalTemperaturePercentage { get; private set; }
+
+ public static string HottestPartName { get; private set; }
+
+ public static double HottestSkinTemperature { get; private set; }
+
+ public static double HottestSkinTemperatureMax { get; private set; }
+
+ public static double HottestTemperature { get; private set; }
+
+ public static double HottestTemperatureMax { get; private set; }
+
+ public static ThermalProcessor Instance
+ {
+ get
+ {
+ return instance;
+ }
+ }
+
+ public static double InternalFlux { get; private set; }
+
+ public static double RadiationFlux { get; private set; }
+
+ public static bool ShowDetails { get; private set; }
+
+ public void Update()
+ {
+ if (FlightGlobals.ActiveVessel.parts.Count == 0)
+ {
+ ShowDetails = false;
+ return;
+ }
+
+ ShowDetails = true;
+
+ ConvectionFlux = 0.0;
+ RadiationFlux = 0.0;
+ InternalFlux = 0.0;
+ HottestTemperature = 0.0;
+ HottestSkinTemperature = 0.0;
+ CoolestTemperature = double.MaxValue;
+ CoolestSkinTemperature = double.MaxValue;
+ CriticalTemperature = double.MaxValue;
+ CriticalSkinTemperature = double.MaxValue;
+ CriticalTemperaturePercentage = 0.0;
+ HottestPartName = string.Empty;
+ CoolestPartName = string.Empty;
+ CriticalPartName = string.Empty;
+
+ for (int i = 0; i < FlightGlobals.ActiveVessel.parts.Count; ++i)
+ {
+ Part part = FlightGlobals.ActiveVessel.parts[i];
+
+ ConvectionFlux = ConvectionFlux + part.thermalConvectionFlux;
+ RadiationFlux = RadiationFlux + part.thermalRadiationFlux;
+ InternalFlux = InternalFlux + part.thermalInternalFluxPrevious;
+
+ if (part.temperature > HottestTemperature || part.skinTemperature > HottestSkinTemperature)
+ {
+ HottestTemperature = part.temperature;
+ HottestTemperatureMax = part.maxTemp;
+ HottestSkinTemperature = part.skinTemperature;
+ HottestSkinTemperatureMax = part.skinMaxTemp;
+ HottestPartName = part.partInfo.title;
+ }
+ if (part.temperature < CoolestTemperature || part.skinTemperature < CoolestSkinTemperature)
+ {
+ CoolestTemperature = part.temperature;
+ CoolestTemperatureMax = part.maxTemp;
+ CoolestSkinTemperature = part.skinTemperature;
+ CoolestSkinTemperatureMax = part.skinMaxTemp;
+ CoolestPartName = part.partInfo.title;
+ }
+
+ if (part.temperature / part.maxTemp > CriticalTemperaturePercentage || part.skinTemperature / part.skinMaxTemp > CriticalTemperaturePercentage)
+ {
+ CriticalTemperature = part.temperature;
+ CriticalTemperatureMax = part.maxTemp;
+ CriticalSkinTemperature = part.skinTemperature;
+ CriticalSkinTemperatureMax = part.skinMaxTemp;
+ CriticalTemperaturePercentage = Math.Max(part.temperature / part.maxTemp, part.skinTemperature / part.skinMaxTemp);
+ CriticalPartName = part.partInfo.title;
+ }
+ }
+ }
+
+ public bool UpdateRequested { get; set; }
+
+ public static void RequestUpdate()
+ {
+ instance.UpdateRequested = true;
+ }
+ }
+}
--- a/KerbalEngineer/Flight/Readouts/Vessel/DeltaVStaged.cs
+++ b/KerbalEngineer/Flight/Readouts/Vessel/DeltaVStaged.cs
@@ -30,13 +30,6 @@
{
public class DeltaVStaged : ReadoutModule
{
- #region Fields
-
- private int numberOfStages;
- private bool showing;
-
- #endregion
-
#region Constructors
public DeltaVStaged()
--- a/KerbalEngineer/Flight/Readouts/Vessel/IntakeAirDemandSupply.cs
+++ b/KerbalEngineer/Flight/Readouts/Vessel/IntakeAirDemandSupply.cs
@@ -65,16 +65,6 @@
.Sum(p => p.currentRequirement);
}
}
- if (part.Modules.Contains("ModuleEnginesFX"))
- {
- var engine = part.Modules["ModuleEnginesFX"] as ModuleEnginesFX;
- if (engine.isOperational)
- {
- demand += engine.propellants
- .Where(p => p.name == "IntakeAir")
- .Sum(p => p.currentRequirement);
- }
- }
}
return demand;
}
--- a/KerbalEngineer/Flight/Readouts/Vessel/Mass.cs
+++ b/KerbalEngineer/Flight/Readouts/Vessel/Mass.cs
@@ -28,12 +28,6 @@
{
public class Mass : ReadoutModule
{
- #region Fields
-
- private bool showing;
-
- #endregion
-
#region Constructors
public Mass()
--- a/KerbalEngineer/Flight/Readouts/Vessel/PartCount.cs
+++ b/KerbalEngineer/Flight/Readouts/Vessel/PartCount.cs
@@ -46,7 +46,7 @@
{
if (SimulationProcessor.ShowDetails)
{
- this.DrawLine(Units.ConcatF(SimulationProcessor.LastStage.partCount, SimulationProcessor.LastStage.totalPartCount), section.IsHud);
+ this.DrawLine(Units.ConcatF(SimulationProcessor.LastStage.partCount, SimulationProcessor.LastStage.totalPartCount, 0), section.IsHud);
}
}
--- a/KerbalEngineer/Flight/Sections/SectionEditor.cs
+++ b/KerbalEngineer/Flight/Sections/SectionEditor.cs
@@ -215,15 +215,18 @@
this.ParentSection.Name = GUILayout.TextField(this.ParentSection.Name, this.textStyle);
var isShowingInControlBar = !string.IsNullOrEmpty(this.ParentSection.Abbreviation);
this.ParentSection.Abbreviation = GUILayout.TextField(this.ParentSection.Abbreviation, this.textStyle, GUILayout.Width(75.0f));
+
+ ParentSection.IsHud = GUILayout.Toggle(this.ParentSection.IsHud, "HUD", this.readoutButtonStyle, GUILayout.Width(50.0f));
+ if (ParentSection.IsHud)
+ {
+ this.ParentSection.IsHudBackground = GUILayout.Toggle(this.ParentSection.IsHudBackground, "BG", this.readoutButtonStyle, GUILayout.Width(50.0f));
+ }
+
if (this.ParentSection.IsCustom)
{
if (isShowingInControlBar && string.IsNullOrEmpty(this.ParentSection.Abbreviation))
{
DisplayStack.Instance.RequestResize();
- }
- if (this.ParentSection.IsHud = GUILayout.Toggle(this.ParentSection.IsHud, "HUD", this.readoutButtonStyle, GUILayout.Width(50.0f)))
- {
- this.ParentSection.IsHudBackground = GUILayout.Toggle(this.ParentSection.IsHudBackground, "BG", this.readoutButtonStyle, GUILayout.Width(50.0f));
}
if (GUILayout.Button("DELETE SECTION", this.readoutButtonStyle, GUILayout.Width(150.0f)))
--- a/KerbalEngineer/Flight/Sections/SectionLibrary.cs
+++ b/KerbalEngineer/Flight/Sections/SectionLibrary.cs
@@ -1,7 +1,7 @@
//
// Kerbal Engineer Redux
//
-// Copyright (C) 2014 CYBUTEK
+// Copyright (C) 2015 CYBUTEK
//
// 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
@@ -19,22 +19,19 @@
#region Using Directives
-using System.Collections.Generic;
-using System.Linq;
-
-using KerbalEngineer.Flight.Readouts;
-using KerbalEngineer.Settings;
-
-using UnityEngine;
-
#endregion
namespace KerbalEngineer.Flight.Sections
{
+ using System.Collections.Generic;
+ using System.Linq;
+ using Readouts;
+ using Settings;
+ using UnityEngine;
+
public static class SectionLibrary
{
#region Constructors
-
/// <summary>
/// Sets up and populates the library with the stock sections on creation.
/// </summary>
@@ -71,7 +68,15 @@
ReadoutModules = ReadoutLibrary.GetCategory(ReadoutCategory.GetCategory("Rendezvous")).Where(r => r.IsDefault).ToList()
});
- var hud1 = new SectionModule
+ CustomSections.Add(new SectionModule
+ {
+ Name = "THERMAL",
+ Abbreviation = "HEAT",
+ ReadoutModules = ReadoutLibrary.GetCategory(ReadoutCategory.GetCategory("Thermal")).Where(r => r.IsDefault).ToList(),
+ IsCustom = true
+ });
+
+ SectionModule hud1 = new SectionModule
{
Name = "HUD 1",
Abbreviation = "HUD 1",
@@ -90,7 +95,7 @@
hud1.IsHud = true;
CustomSections.Add(hud1);
- var hud2 = new SectionModule
+ SectionModule hud2 = new SectionModule
{
Name = "HUD 2",
Abbreviation = "HUD 2",
@@ -101,7 +106,8 @@
ReadoutLibrary.GetReadout("AltitudeTerrain"),
ReadoutLibrary.GetReadout("VerticalSpeed"),
ReadoutLibrary.GetReadout("HorizontalSpeed"),
- ReadoutLibrary.GetReadout("Biome")
+ ReadoutLibrary.GetReadout("Biome"),
+ ReadoutLibrary.GetReadout("MachNumber")
},
};
hud2.FloatingPositionX = Screen.width * 0.75f - (hud2.ReadoutModules.First().ContentWidth * 0.5f);
@@ -109,11 +115,9 @@
hud2.IsHud = true;
CustomSections.Add(hud2);
}
-
#endregion
#region Properties
-
/// <summary>
/// Gets and sets a list of custom sections.
/// </summary>
@@ -133,13 +137,11 @@
/// Gets and sets a list of stock sections
/// </summary>
public static List<SectionModule> StockSections { get; set; }
-
#endregion
#region Updating
#region Methods: public
-
/// <summary>
/// Fixed update all of the sections.
/// </summary>
@@ -160,17 +162,15 @@
UpdateSections(StockSections);
UpdateSections(CustomSections);
}
-
#endregion
#region Methods: private
-
/// <summary>
/// Fixed updates a list of sections.
/// </summary>
private static void FixedUpdateSections(IEnumerable<SectionModule> sections)
{
- foreach (var section in sections)
+ foreach (SectionModule section in sections)
{
if (section.IsVisible)
{
@@ -184,13 +184,13 @@
/// </summary>
private static void UpdateSections(IEnumerable<SectionModule> sections)
{
- foreach (var section in sections)
+ foreach (SectionModule section in sections)
{
if (section.IsVisible)
{
if (!section.IsFloating)
{
- foreach (var readout in section.ReadoutModules)
+ foreach (ReadoutModule readout in section.ReadoutModules)
{
if (readout.ResizeRequested)
{
@@ -203,7 +203,7 @@
}
else
{
- foreach (var readout in section.ReadoutModules)
+ foreach (ReadoutModule readout in section.ReadoutModules)
{
if (readout.ResizeRequested)
{
@@ -218,13 +218,11 @@
NumberOfSections++;
}
}
-
#endregion
#endregion
#region Saving and Loading
-
/// <summary>
/// Loads the state of all stored sections.
/// </summary>
@@ -243,11 +241,11 @@
}
});
- var handler = SettingHandler.Load("SectionLibrary.xml", new[] {typeof(List<SectionModule>)});
+ SettingHandler handler = SettingHandler.Load("SectionLibrary.xml", new[] { typeof(List<SectionModule>) });
StockSections = handler.Get("StockSections", StockSections);
CustomSections = handler.Get("CustomSections", CustomSections);
- foreach (var section in GetAllSections())
+ foreach (SectionModule section in GetAllSections())
{
section.ClearNullReadouts();
}
@@ -258,22 +256,20 @@
/// </summary>
public static void Save()
{
- var handler = new SettingHandler();
+ SettingHandler handler = new SettingHandler();
handler.Set("StockSections", StockSections);
handler.Set("CustomSections", CustomSections);
handler.Save("SectionLibrary.xml");
}
-
#endregion
#region Methods
-
/// <summary>
/// Gets a list containing all section modules.
/// </summary>
public static List<SectionModule> GetAllSections()
{
- var sections = new List<SectionModule>();
+ List<SectionModule> sections = new List<SectionModule>();
sections.AddRange(StockSections);
sections.AddRange(CustomSections);
return sections;
@@ -326,7 +322,6 @@
{
return StockSections.Remove(GetStockSection(name));
}
-
#endregion
}
}
--- a/KerbalEngineer/Flight/Sections/SectionWindow.cs
+++ b/KerbalEngineer/Flight/Sections/SectionWindow.cs
@@ -134,7 +134,11 @@
(!this.ParentSection.IsHud || this.ParentSection.IsEditorVisible) ? this.windowStyle
: this.ParentSection.IsHudBackground && this.ParentSection.LineCount > 0
? this.hudWindowBgStyle
- : this.hudWindowStyle).ClampToScreen();
+ : this.hudWindowStyle);
+
+ windowPosition = (ParentSection.IsHud) ? windowPosition.ClampInsideScreen() : windowPosition.ClampToScreen();
+
+
this.ParentSection.FloatingPositionX = this.windowPosition.x;
this.ParentSection.FloatingPositionY = this.windowPosition.y;
}
--- a/KerbalEngineer/Helpers/AngleHelper.cs
+++ b/KerbalEngineer/Helpers/AngleHelper.cs
@@ -17,21 +17,30 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
-#region Using Directives
-
-using UnityEngine;
-
-#endregion
-
namespace KerbalEngineer.Helpers
{
+ using UnityEngine;
+
public static class AngleHelper
{
- #region Methods: public
+ public static double Clamp180(double angle)
+ {
+ angle = Clamp360(angle);
+ if (angle > 180.0)
+ {
+ angle = angle - 360.0;
+ }
+ return angle;
+ }
- public static double Clamp360(double value)
+ public static double Clamp360(double angle)
{
- return ClampBetween(value, 0.0, 360.0);
+ angle = angle % 360.0;
+ if (angle < 0.0)
+ {
+ angle = angle + 360.0;
+ }
+ return angle;
}
public static double ClampBetween(double value, double minimum, double maximum)
@@ -51,8 +60,8 @@
public static double GetAngleBetweenVectors(Vector3d left, Vector3d right)
{
- var angle = Vector3d.Angle(left, right);
- var rotated = QuaternionD.AngleAxis(90.0, Vector3d.forward) * right;
+ double angle = Vector3d.Angle(left, right);
+ Vector3d rotated = QuaternionD.AngleAxis(90.0, Vector3d.forward) * right;
if (Vector3d.Angle(rotated, left) > 90.0)
{
@@ -60,7 +69,5 @@
}
return angle;
}
-
- #endregion
}
}
--- a/KerbalEngineer/Helpers/ForceAccumulator.cs
+++ b/KerbalEngineer/Helpers/ForceAccumulator.cs
@@ -19,19 +19,39 @@
using System;
using System.Collections.Generic;
+using KerbalEngineer.VesselSimulator;
namespace KerbalEngineer
{
// a (force, application point) tuple
public class AppliedForce
{
+ private static readonly Pool<AppliedForce> pool = new Pool<AppliedForce>(Create, Reset);
+
public Vector3d vector;
public Vector3d applicationPoint;
- public AppliedForce(Vector3d vector, Vector3d applicationPoint) {
- this.vector = vector;
- this.applicationPoint = applicationPoint;
+ static private AppliedForce Create()
+ {
+ return new AppliedForce();
}
+
+ static private void Reset(AppliedForce appliedForce) { }
+
+ static public AppliedForce New(Vector3d vector, Vector3d applicationPoint)
+ {
+ AppliedForce force = pool.Borrow();
+ force.vector = vector;
+ force.applicationPoint = applicationPoint;
+ return force;
+ }
+
+ public void Release()
+ {
+ pool.Release(this);
+ }
+
+
}
// This class was mostly adapted from FARCenterQuery, part of FAR, by ferram4, GPLv3
@@ -47,7 +67,7 @@
// some amount of residual torque. The line with the least amount of residual torque is chosen.
public class ForceAccumulator
{
- // Total force.
+ // Total force.
private Vector3d totalForce = Vector3d.zero;
// Torque needed to compensate if force were applied at origin.
private Vector3d totalZeroOriginTorque = Vector3d.zero;
--- a/KerbalEngineer/Helpers/Pool.cs
+++ b/KerbalEngineer/Helpers/Pool.cs
@@ -1,61 +1,53 @@
-namespace KerbalEngineer.VesselSimulator
+using System.Collections.Generic;
+
+namespace KerbalEngineer
{
- using System.Collections.Generic;
+ /// <summary>
+ /// Pool of object
+ /// </summary>
+ public class Pool<T> {
+
+ private readonly Stack<T> values = new Stack<T>();
- public class Pool<T> where T : new()
- {
- private static List<T> available = new List<T>();
- private static List<T> inUse = new List<T>();
+ private readonly CreateDelegate<T> create;
+ private readonly ResetDelegate<T> reset;
- public static int PoolCount
- {
- get
- {
- return available.Count + inUse.Count;
+ public delegate R CreateDelegate<out R>();
+ public delegate void ResetDelegate<in T1>(T1 a);
+
+ /// <summary>
+ /// Creates an empty pool with the specified object creation and reset delegates.
+ /// </summary>
+ public Pool(CreateDelegate<T> create, ResetDelegate<T> reset) {
+ this.create = create;
+ this.reset = reset;
+ }
+
+ /// <summary>
+ /// Borrows an object from the pool.
+ /// </summary>
+ public T Borrow() {
+ lock (values) {
+ return values.Count > 0 ? values.Pop() : create();
}
}
-
- public static T GetPoolObject()
- {
- T obj;
- if (available.Count > 0)
- {
- obj = available[0];
- available.RemoveAt(0);
- }
- else
- {
- obj = new T();
- }
-
- inUse.Add(obj);
- return obj;
- }
-
- public static void Release(T obj)
- {
- if (inUse.Contains(obj))
- {
- inUse.Remove(obj);
- available.Add(obj);
+
+ /// <summary>
+ /// Release an object, reset it and returns it to the pool.
+ /// </summary>
+ public void Release(T value) {
+ reset(value);
+ lock (values) {
+ values.Push(value);
}
}
-
- public static void Release(List<T> objList)
+
+ /// <summary>
+ /// Current size of the pool.
+ /// </summary>
+ public int Count()
{
- for (int i = 0; i < objList.Count; ++i)
- {
- Release(objList[i]);
- }
- }
-
- public static void ReleaseAll()
- {
- for (int i = 0; i < inUse.Count; ++i)
- {
- available.Add(inUse[i]);
- }
- inUse.Clear();
+ return values.Count;
}
}
}
--- a/KerbalEngineer/Helpers/Units.cs
+++ b/KerbalEngineer/Helpers/Units.cs
@@ -1,7 +1,7 @@
//
// Kerbal Engineer Redux
//
-// Copyright (C) 2014 CYBUTEK
+// Copyright (C) 2015 CYBUTEK
//
// 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
@@ -19,14 +19,10 @@
namespace KerbalEngineer.Helpers
{
- #region Using Directives
using System;
-
- #endregion
public static class Units
{
- #region Methods
public const double GRAVITY = 9.80665;
public static string Concat(int value1, int value2)
@@ -85,6 +81,17 @@
public static string ToAngle(double value, int decimals = 5)
{
return value.ToString("F" + decimals) + "°";
+ }
+
+ public static string ToAngleDMS(double value)
+ {
+ double absAngle = Math.Abs(value);
+ int deg = (int)Math.Floor(absAngle);
+ double rem = absAngle - deg;
+ int min = (int)Math.Floor(rem * 60);
+ rem -= ((double)min / 60);
+ int sec = (int)Math.Floor(rem * 3600);
+ return String.Format("{0:0}° {1:00}' {2:00}\"", deg, min, sec);
}
public static string ToDistance(double value, int decimals = 1)
@@ -116,6 +123,11 @@
return value.ToString("N" + decimals) + "Mm";
}
+ public static string ToFlux(double value)
+ {
+ return value.ToString("#,0.00") + "W";
+ }
+
public static string ToForce(double value)
{
return value.ToString((value < 100000.0) ? (value < 10000.0) ? (value < 100.0) ? (Math.Abs(value) < Double.Epsilon) ? "N0" : "N3" : "N2" : "N1" : "N0") + "kN";
@@ -128,6 +140,11 @@
return value1.ToString(format1) + " / " + value2.ToString(format2) + "kN";
}
+ public static string ToMach(double value)
+ {
+ return value.ToString("0.00") + "Ma";
+ }
+
public static string ToMass(double value, int decimals = 0)
{
if (value >= 1000.0)
@@ -171,6 +188,16 @@
return value.ToString("N" + decimals) + "m/s";
}
+ public static string ToTemperature(double value)
+ {
+ return value.ToString("#,0") + "K";
+ }
+
+ public static string ToTemperature(double value1, double value2)
+ {
+ return value1.ToString("#,0") + " / " + value2.ToString("#,0") + "K";
+ }
+
public static string ToTime(double value)
{
return TimeFormatter.ConvertToString(value);
@@ -180,6 +207,5 @@
{
return value.ToString((value < 100.0) ? (Math.Abs(value) < Double.Epsilon) ? "N0" : "N1" : "N0") + "kNm";
}
- #endregion
}
}
--- a/KerbalEngineer/KerbalEngineer.csproj
+++ b/KerbalEngineer/KerbalEngineer.csproj
@@ -48,6 +48,7 @@
<Compile Include="Editor\ResourceInfoItem.cs" />
<Compile Include="Extensions\FloatExtensions.cs" />
<Compile Include="Extensions\OrbitExtensions.cs" />
+ <Compile Include="Extensions\StringExtensions.cs" />
<Compile Include="Flight\ActionMenuGui.cs" />
<Compile Include="Flight\Presets\Preset.cs" />
<Compile Include="Flight\Readouts\Miscellaneous\SystemTime.cs" />
@@ -89,6 +90,21 @@
<Compile Include="Flight\Readouts\Surface\Biome.cs" />
<Compile Include="Flight\Readouts\Surface\HorizontalAcceleration.cs" />
<Compile Include="Flight\Readouts\Surface\VerticalAcceleration.cs" />
+ <Compile Include="Flight\Readouts\Surface\MachNumber.cs" />
+ <Compile Include="Flight\Readouts\Thermal\CoolestSkinTemperature.cs" />
+ <Compile Include="Flight\Readouts\Thermal\CriticalPart.cs" />
+ <Compile Include="Flight\Readouts\Thermal\CoolestPart.cs" />
+ <Compile Include="Flight\Readouts\Thermal\CoolestTemperature.cs" />
+ <Compile Include="Flight\Readouts\Thermal\CriticalThermalPercentage.cs" />
+ <Compile Include="Flight\Readouts\Thermal\CriticalSkinTemperature.cs" />
+ <Compile Include="Flight\Readouts\Thermal\CriticalTemperature.cs" />
+ <Compile Include="Flight\Readouts\Thermal\HottestSkinTemperature.cs" />
+ <Compile Include="Flight\Readouts\Thermal\InternalFlux.cs" />
+ <Compile Include="Flight\Readouts\Thermal\RadiationFlux.cs" />
+ <Compile Include="Flight\Readouts\Thermal\ConvectionFlux.cs" />
+ <Compile Include="Flight\Readouts\Thermal\HottestTemperature.cs" />
+ <Compile Include="Flight\Readouts\Thermal\HottestPart.cs" />
+ <Compile Include="Flight\Readouts\Thermal\ThermalProcessor.cs" />
<Compile Include="Flight\Readouts\Vessel\AttitudeProcessor.cs" />
<Compile Include="Flight\Readouts\Vessel\DeltaVCurrentTotal.cs" />
<Compile Include="Flight\Readouts\Vessel\PitchRate.cs" />
@@ -224,6 +240,7 @@
<Private>False</Private>
</Reference>
</ItemGroup>
+ <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="PostBuildMacros">
<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
--- a/KerbalEngineer/Properties/AssemblyInfo.cs
+++ b/KerbalEngineer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion(KerbalEngineer.EngineerGlobals.AssemblyVersion)]
+[assembly: AssemblyVersion(KerbalEngineer.EngineerGlobals.ASSEMBLY_VERSION)]
--- a/KerbalEngineer/VesselSimulator/AttachNodeSim.cs
+++ b/KerbalEngineer/VesselSimulator/AttachNodeSim.cs
@@ -26,11 +26,38 @@
using System;
using System.Text;
- internal class AttachNodeSim : Pool<AttachNodeSim>
+ internal class AttachNodeSim
{
+
+ private static readonly Pool<AttachNodeSim> pool = new Pool<AttachNodeSim>(Create, Reset);
+
public PartSim attachedPartSim;
public String id;
public AttachNode.NodeType nodeType;
+
+ private static AttachNodeSim Create()
+ {
+ return new AttachNodeSim();
+ }
+
+ public static AttachNodeSim New(PartSim partSim, String newId, AttachNode.NodeType newNodeType)
+ {
+ AttachNodeSim nodeSim = pool.Borrow();
+
+ nodeSim.attachedPartSim = partSim;
+ nodeSim.nodeType = newNodeType;
+ nodeSim.id = newId;
+
+ return nodeSim;
+ }
+
+ static private void Reset(AttachNodeSim attachNodeSim) { }
+
+
+ public void Release()
+ {
+ pool.Release(this);
+ }
public void DumpToBuffer(StringBuilder buffer)
{
@@ -49,14 +76,5 @@
buffer.Append(":");
buffer.Append(id);
}
-
- public AttachNodeSim Initialise(PartSim partSim, String newId, AttachNode.NodeType newNodeType)
- {
- attachedPartSim = partSim;
- nodeType = newNodeType;
- id = newId;
-
- return this;
- }
}
}
--- a/KerbalEngineer/VesselSimulator/EngineSim.cs
+++ b/KerbalEngineer/VesselSimulator/EngineSim.cs
@@ -26,104 +26,182 @@
using Helpers;
using UnityEngine;
- public class EngineSim : Pool<EngineSim>
+ public class EngineSim
{
- public double actualThrust = 0.0;
- public List<AppliedForce> appliedForces = new List<AppliedForce>();
+ private static readonly Pool<EngineSim> pool = new Pool<EngineSim>(Create, Reset);
+
+ private readonly ResourceContainer resourceConsumptions = new ResourceContainer();
+ private readonly ResourceContainer resourceFlowModes = new ResourceContainer();
+
+ public double actualThrust = 0;
public bool isActive = false;
public double isp = 0;
public PartSim partSim;
+ public List<AppliedForce> appliedForces = new List<AppliedForce>();
public float maxMach;
public double thrust = 0;
// Add thrust vector to account for directional losses
public Vector3 thrustVec;
- private readonly ResourceContainer resourceConsumptions = new ResourceContainer();
-
- public EngineSim Initialise(PartSim theEngine,
- double atmosphere,
- float machNumber,
- float maxFuelFlow,
- float minFuelFlow,
- float thrustPercentage,
- Vector3 vecThrust,
- FloatCurve atmosphereCurve,
- bool atmChangeFlow,
- FloatCurve atmCurve,
- FloatCurve velCurve,
- float currentThrottle,
- bool throttleLocked,
- List<Propellant> propellants,
- bool active,
- float resultingThrust,
- List<Transform> thrustTransforms)
- {
- StringBuilder buffer = null;
-
- isp = 0.0;
- maxMach = 0.0f;
- actualThrust = 0.0;
- partSim = theEngine;
- isActive = active;
- thrustVec = vecThrust;
- resourceConsumptions.Reset();
- appliedForces.Clear();
+
+ private static EngineSim Create()
+ {
+ return new EngineSim();
+ }
+
+ private static void Reset(EngineSim engineSim)
+ {
+ engineSim.resourceConsumptions.Reset();
+ engineSim.resourceFlowModes.Reset();
+ engineSim.actualThrust = 0;
+ engineSim.isActive = false;
+ engineSim.isp = 0;
+ for (int i = 0; i < engineSim.appliedForces.Count; i++)
+ {
+ engineSim.appliedForces[i].Release();
+ }
+ engineSim.appliedForces.Clear();
+ engineSim.thrust = 0;
+ engineSim.maxMach = 0f;
+ }
+
+ public void Release()
+ {
+ pool.Release(this);
+ }
+
+ public static EngineSim New(PartSim theEngine,
+ double atmosphere,
+ float machNumber,
+ float maxFuelFlow,
+ float minFuelFlow,
+ float thrustPercentage,
+ Vector3 vecThrust,
+ FloatCurve atmosphereCurve,
+ bool atmChangeFlow,
+ FloatCurve atmCurve,
+ FloatCurve velCurve,
+ float currentThrottle,
+ float IspG,
+ bool throttleLocked,
+ List<Propellant> propellants,
+ bool active,
+ float resultingThrust,
+ List<Transform> thrustTransforms,
+ LogMsg log)
+ {
+ EngineSim engineSim = pool.Borrow();
+
+ engineSim.isp = 0.0;
+ engineSim.maxMach = 0.0f;
+ engineSim.actualThrust = 0.0;
+ engineSim.partSim = theEngine;
+ engineSim.isActive = active;
+ engineSim.thrustVec = vecThrust;
+ engineSim.resourceConsumptions.Reset();
+ engineSim.resourceFlowModes.Reset();
+ engineSim.appliedForces.Clear();
double flowRate = 0.0;
- if (partSim.hasVessel)
- {
- float flowModifier = GetFlowModifier(atmChangeFlow, atmCurve, partSim.part.atmDensity, velCurve, machNumber, ref maxMach);
- isp = atmosphereCurve.Evaluate((float)atmosphere);
- thrust = GetThrust(Mathf.Lerp(minFuelFlow, maxFuelFlow, GetThrustPercent(thrustPercentage)) * flowModifier, isp);
- actualThrust = isActive ? resultingThrust : 0.0;
+ if (engineSim.partSim.hasVessel)
+ {
+ if (log != null) log.buf.AppendLine("hasVessel is true");
+
+ float flowModifier = GetFlowModifier(atmChangeFlow, atmCurve, engineSim.partSim.part.atmDensity, velCurve, machNumber, ref engineSim.maxMach);
+ engineSim.isp = atmosphereCurve.Evaluate((float)atmosphere);
+ engineSim.thrust = GetThrust(Mathf.Lerp(minFuelFlow, maxFuelFlow, GetThrustPercent(thrustPercentage)) * flowModifier, engineSim.isp);
+ engineSim.actualThrust = engineSim.isActive ? resultingThrust : 0.0;
+ if (log != null)
+ {
+ log.buf.AppendFormat("flowMod = {0:g6}\n", flowModifier);
+ log.buf.AppendFormat("isp = {0:g6}\n", engineSim.isp);
+ log.buf.AppendFormat("thrust = {0:g6}\n", engineSim.thrust);
+ log.buf.AppendFormat("actual = {0:g6}\n", engineSim.actualThrust);
+ }
if (throttleLocked)
{
- flowRate = GetFlowRate(thrust, isp);
+ if (log != null) log.buf.AppendLine("throttleLocked is true, using thrust for flowRate");
+ flowRate = GetFlowRate(engineSim.thrust, engineSim.isp);
}
else
{
- if (currentThrottle > 0.0f && partSim.isLanded == false)
+ if (currentThrottle > 0.0f && engineSim.partSim.isLanded == false)
{
- flowRate = GetFlowRate(actualThrust, isp);
+ if (log != null) log.buf.AppendLine("throttled up and not landed, using actualThrust for flowRate");
+ flowRate = GetFlowRate(engineSim.actualThrust, engineSim.isp);
}
else
{
- flowRate = GetFlowRate(thrust, isp);
+ if (log != null) log.buf.AppendLine("throttled down or landed, using thrust for flowRate");
+ flowRate = GetFlowRate(engineSim.thrust, engineSim.isp);
}
}
}
else
{
- float flowModifier = GetFlowModifier(atmChangeFlow, atmCurve, CelestialBodies.SelectedBody.GetDensity(BuildAdvanced.Altitude), velCurve, machNumber, ref maxMach);
- isp = atmosphereCurve.Evaluate((float)atmosphere);
- thrust = GetThrust(Mathf.Lerp(minFuelFlow, maxFuelFlow, GetThrustPercent(thrustPercentage)) * flowModifier, isp);
- flowRate = GetFlowRate(thrust, isp);
- }
-
- float flowMass = 0.0f;
-
+ if (log != null) log.buf.AppendLine("hasVessel is false");
+ float flowModifier = GetFlowModifier(atmChangeFlow, atmCurve, CelestialBodies.SelectedBody.GetDensity(BuildAdvanced.Altitude), velCurve, machNumber, ref engineSim.maxMach);
+ engineSim.isp = atmosphereCurve.Evaluate((float)atmosphere);
+ engineSim.thrust = GetThrust(Mathf.Lerp(minFuelFlow, maxFuelFlow, GetThrustPercent(thrustPercentage)) * flowModifier, engineSim.isp);
+ engineSim.actualThrust = 0d;
+ if (log != null)
+ {
+ log.buf.AppendFormat("flowMod = {0:g6}\n", flowModifier);
+ log.buf.AppendFormat("isp = {0:g6}\n", engineSim.isp);
+ log.buf.AppendFormat("thrust = {0:g6}\n", engineSim.thrust);
+ log.buf.AppendFormat("actual = {0:g6}\n", engineSim.actualThrust);
+ }
+
+ if (log != null) log.buf.AppendLine("no vessel, using thrust for flowRate");
+ flowRate = GetFlowRate(engineSim.thrust, engineSim.isp);
+ }
+
+ if (log != null) log.buf.AppendFormat("flowRate = {0:g6}\n", flowRate);
+
+ float flowMass = 0f;
for (int i = 0; i < propellants.Count; ++i)
{
Propellant propellant = propellants[i];
- flowMass += propellant.ratio * ResourceContainer.GetResourceDensity(propellant.id);
+ if (!propellant.ignoreForIsp)
+ flowMass += propellant.ratio * ResourceContainer.GetResourceDensity(propellant.id);
+ }
+
+ if (log != null) log.buf.AppendFormat("flowMass = {0:g6}\n", flowMass);
+
+ for (int i = 0; i < propellants.Count; ++i)
+ {
+ Propellant propellant = propellants[i];
+
+ if (propellant.name == "ElectricCharge" || propellant.name == "IntakeAir")
+ {
+ continue;
+ }
double consumptionRate = propellant.ratio * flowRate / flowMass;
- resourceConsumptions.Add(propellant.id, consumptionRate);
- }
-
- double thrustPerThrustTransform = thrust / thrustTransforms.Count;
- for (int i = 0; i < thrustTransforms.Count; ++i)
+ if (log != null) log.buf.AppendFormat(
+ "Add consumption({0}, {1}:{2:d}) = {3:g6}\n",
+ ResourceContainer.GetResourceName(propellant.id),
+ theEngine.name,
+ theEngine.partId,
+ consumptionRate);
+ engineSim.resourceConsumptions.Add(propellant.id, consumptionRate);
+ engineSim.resourceFlowModes.Add(propellant.id, (double)propellant.GetFlowMode());
+ }
+
+ double thrustPerThrustTransform = engineSim.thrust / thrustTransforms.Count;
+ for (int i = 0; i < thrustTransforms.Count; i++)
{
Transform thrustTransform = thrustTransforms[i];
-
Vector3d direction = thrustTransform.forward.normalized;
Vector3d position = thrustTransform.position;
- appliedForces.Add(new AppliedForce(direction * thrustPerThrustTransform, position));
- }
-
- return this;
+
+ AppliedForce appliedForce = AppliedForce.New(direction * thrustPerThrustTransform, position);
+ engineSim.appliedForces.Add(appliedForce);
+ }
+
+ return engineSim;
}
public ResourceContainer ResourceConsumptions
@@ -188,53 +266,67 @@
buffer.AppendFormat("[thrust = {0:g6}, actual = {1:g6}, isp = {2:g6}\n", thrust, actualThrust, isp);
}
+ // A dictionary to hold a set of parts for each resource
+ Dictionary<int, HashSet<PartSim>> sourcePartSets = new Dictionary<int, HashSet<PartSim>>();
+
+ Dictionary<int, HashSet<PartSim>> stagePartSets = new Dictionary<int, HashSet<PartSim>>();
+
+ HashSet<PartSim> visited = new HashSet<PartSim>();
+
public bool SetResourceDrains(List<PartSim> allParts, List<PartSim> allFuelLines, HashSet<PartSim> drainingParts)
{
LogMsg log = null;
-
- // A dictionary to hold a set of parts for each resource
- Dictionary<int, HashSet<PartSim>> sourcePartSets = new Dictionary<int, HashSet<PartSim>>();
-
- for (int i = 0; i < resourceConsumptions.Types.Count; ++i)
- {
- int type = resourceConsumptions.Types[i];
- HashSet<PartSim> sourcePartSet = null;
- switch (ResourceContainer.GetResourceFlowMode(type))
+
+ foreach (HashSet<PartSim> sourcePartSet in sourcePartSets.Values)
+ {
+ sourcePartSet.Clear();
+ }
+
+ for (int index = 0; index < this.resourceConsumptions.Types.Count; index++)
+ {
+ int type = this.resourceConsumptions.Types[index];
+
+ HashSet<PartSim> sourcePartSet;
+ if (!sourcePartSets.TryGetValue(type, out sourcePartSet))
+ {
+ sourcePartSet = new HashSet<PartSim>();
+ sourcePartSets.Add(type, sourcePartSet);
+ }
+
+ switch ((ResourceFlowMode)this.resourceFlowModes[type])
{
case ResourceFlowMode.NO_FLOW:
if (partSim.resources[type] > SimManager.RESOURCE_MIN && partSim.resourceFlowStates[type] != 0)
{
- sourcePartSet = new HashSet<PartSim>();
+ //sourcePartSet = new HashSet<PartSim>();
//MonoBehaviour.print("SetResourceDrains(" + name + ":" + partId + ") setting sources to just this");
sourcePartSet.Add(partSim);
}
break;
case ResourceFlowMode.ALL_VESSEL:
- for (int j = 0; j < allParts.Count; ++j)
- {
- PartSim aPartSim = allParts[j];
-
+ for (int i = 0; i < allParts.Count; i++)
+ {
+ PartSim aPartSim = allParts[i];
if (aPartSim.resources[type] > SimManager.RESOURCE_MIN && aPartSim.resourceFlowStates[type] != 0)
{
- if (sourcePartSet == null)
- {
- sourcePartSet = new HashSet<PartSim>();
- }
-
sourcePartSet.Add(aPartSim);
}
}
break;
case ResourceFlowMode.STAGE_PRIORITY_FLOW:
- Dictionary<int, HashSet<PartSim>> stagePartSets = new Dictionary<int, HashSet<PartSim>>();
- int maxStage = -1;
-
- for (int j = 0; j < allParts.Count; ++j)
- {
- PartSim aPartSim = allParts[j];
-
+
+ foreach (HashSet<PartSim> stagePartSet in stagePartSets.Values)
+ {
+ stagePartSet.Clear();
+ }
+ var maxStage = -1;
+
+ //Logger.Log(type);
+ for (int i = 0; i < allParts.Count; i++)
+ {
+ var aPartSim = allParts[i];
if (aPartSim.resources[type] <= SimManager.RESOURCE_MIN || aPartSim.resourceFlowStates[type] == 0)
{
continue;
@@ -265,14 +357,14 @@
break;
case ResourceFlowMode.STACK_PRIORITY_SEARCH:
- HashSet<PartSim> visited = new HashSet<PartSim>();
+ visited.Clear();
if (SimManager.logOutput)
{
log = new LogMsg();
log.buf.AppendLine("Find " + ResourceContainer.GetResourceName(type) + " sources for " + partSim.name + ":" + partSim.partId);
}
- sourcePartSet = partSim.GetSourceSet(type, allParts, visited, log, "");
+ partSim.GetSourceSet(type, allParts, visited, sourcePartSet, log, "");
if (SimManager.logOutput)
{
MonoBehaviour.print(log.buf);
@@ -284,7 +376,8 @@
break;
}
- if (sourcePartSet != null && sourcePartSet.Count > 0)
+
+ if (sourcePartSet.Count > 0)
{
sourcePartSets[type] = sourcePartSet;
if (SimManager.logOutput)
@@ -299,13 +392,13 @@
}
}
}
-
+
// If we don't have sources for all the needed resources then return false without setting up any drains
- for(int i = 0; i < resourceConsumptions.Types.Count; ++i)
- {
- int type = resourceConsumptions.Types[i];
-
- if (!sourcePartSets.ContainsKey(type))
+ for (int i = 0; i < this.resourceConsumptions.Types.Count; i++)
+ {
+ int type = this.resourceConsumptions.Types[i];
+ HashSet<PartSim> sourcePartSet;
+ if (!sourcePartSets.TryGetValue(type, out sourcePartSet) || sourcePartSet.Count == 0)
{
if (SimManager.logOutput)
{
@@ -316,12 +409,10 @@
return false;
}
}
-
// Now we set the drains on the members of the sets and update the draining parts set
- for (int i = 0; i < resourceConsumptions.Types.Count; ++i)
- {
- int type = resourceConsumptions.Types[i];
-
+ for (int i = 0; i < this.resourceConsumptions.Types.Count; i++)
+ {
+ int type = this.resourceConsumptions.Types[i];
HashSet<PartSim> sourcePartSet = sourcePartSets[type];
// Loop through the members of the set
double amount = resourceConsumptions[type] / sourcePartSet.Count;
@@ -329,14 +420,15 @@
{
if (SimManager.logOutput)
{
- MonoBehaviour.print("Adding drain of " + amount + " " + ResourceContainer.GetResourceName(type) + " to " + partSim.name + ":" + partSim.partId);
+ MonoBehaviour.print(
+ "Adding drain of " + amount + " " + ResourceContainer.GetResourceName(type) + " to " + partSim.name + ":" +
+ partSim.partId);
}
partSim.resourceDrains.Add(type, amount);
drainingParts.Add(partSim);
}
}
-
return true;
}
}
--- a/KerbalEngineer/VesselSimulator/PartSim.cs
+++ b/KerbalEngineer/VesselSimulator/PartSim.cs
@@ -17,34 +17,32 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
-#region Using Directives
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using KerbalEngineer.Extensions;
-
-using UnityEngine;
-
-#endregion
namespace KerbalEngineer.VesselSimulator
{
+ using System;
+ using System.Collections.Generic;
+ using System.Linq;
+ using System.Text;
using CompoundParts;
-
- public class PartSim : Pool<PartSim>
+ using Extensions;
+ using UnityEngine;
+
+ public class PartSim
{
+ private static readonly Pool<PartSim> pool = new Pool<PartSim>(Create, Reset);
+
private readonly List<AttachNodeSim> attachNodes = new List<AttachNodeSim>();
+
+ public double realMass;
+ public double baseMass;
+ public double baseMassForCoM;
public Vector3d centerOfMass;
- public double baseMass;
- public double cost;
+ public double baseCost;
public int decoupledInStage;
public bool fuelCrossFeed;
public List<PartSim> fuelTargets = new List<PartSim>();
public bool hasModuleEngines;
- public bool hasModuleEnginesFX;
public bool hasMultiModeEngine;
public bool hasVessel;
@@ -57,7 +55,9 @@
public bool isLanded;
public bool isNoPhysics;
public bool isSepratron;
- public bool localCorrectThrust;
+ public bool isFairing;
+ public float fairingMass;
+ public int stageIndex;
public String name;
public String noCrossFeedNodeKey;
public PartSim parent;
@@ -70,178 +70,173 @@
public double startMass = 0d;
public String vesselName;
public VesselType vesselType;
+
+
+ private static PartSim Create()
+ {
+ return new PartSim();
+ }
private static void Reset(PartSim partSim)
{
+ for (int i = 0; i < partSim.attachNodes.Count; i++)
+ {
+ partSim.attachNodes[i].Release();
+ }
partSim.attachNodes.Clear();
partSim.fuelTargets.Clear();
partSim.resourceDrains.Reset();
partSim.resourceFlowStates.Reset();
partSim.resources.Reset();
- partSim.baseMass = 0.0;
- partSim.startMass = 0.0;
- partSim.centerOfMass = Vector3d.zero;
- partSim.cost = 0.0;
- partSim.decoupledInStage = 0;
- partSim.fuelCrossFeed = false;
- partSim.hasModuleEngines = false;
- partSim.hasModuleEnginesFX = false;
- partSim.hasMultiModeEngine = false;
- partSim.hasVessel = false;
- partSim.initialVesselName = null;
- partSim.inverseStage = 0;
- partSim.isDecoupler = false;
- partSim.isEngine = false;
- partSim.isFuelLine = false;
- partSim.isFuelTank = false;
- partSim.isLanded = false;
- partSim.isNoPhysics = false;
- partSim.isSepratron = false;
- partSim.localCorrectThrust = false;
- partSim.name = null;
- partSim.noCrossFeedNodeKey = null;
+ partSim.baseCost = 0d;
+ partSim.baseMass = 0d;
+ partSim.baseMassForCoM = 0d;
+ partSim.startMass = 0d;
+ }
+
+ public void Release()
+ {
+ pool.Release(this);
+ }
+
+ public static PartSim New(Part thePart, int id, double atmosphere, LogMsg log)
+ {
+ PartSim partSim = pool.Borrow();
+
+ partSim.part = thePart;
+ partSim.centerOfMass = thePart.transform.TransformPoint(thePart.CoMOffset);
+ partSim.partId = id;
+ partSim.name = partSim.part.partInfo.name;
+
+ if (log != null) log.buf.AppendLine("Create PartSim for " + partSim.name);
+
partSim.parent = null;
- partSim.parentAttach = AttachModes.SRF_ATTACH;
- partSim.part = null;
- partSim.partId = 0;
- partSim.vesselName = null;
- partSim.vesselType = VesselType.Base;
- }
-
- public PartSim Initialise(Part thePart, int id, double atmosphere, LogMsg log)
- {
- Reset(this);
-
- this.part = thePart;
- this.centerOfMass = thePart.transform.TransformPoint(thePart.CoMOffset);
- this.partId = id;
- this.name = this.part.partInfo.name;
+ partSim.parentAttach = partSim.part.attachMode;
+ partSim.fuelCrossFeed = partSim.part.fuelCrossFeed;
+ partSim.noCrossFeedNodeKey = partSim.part.NoCrossFeedNodeKey;
+ partSim.decoupledInStage = partSim.DecoupledInStage(partSim.part);
+ partSim.isFuelLine = partSim.part.HasModule<CModuleFuelLine>();
+ partSim.isFuelTank = partSim.part is FuelTank;
+ partSim.isSepratron = partSim.IsSepratron();
+ partSim.isFairing = partSim.IsFairing(partSim.part);
+ partSim.inverseStage = partSim.part.inverseStage;
+ //MonoBehaviour.print("inverseStage = " + inverseStage);
+
+ partSim.baseCost = partSim.part.GetCostDry();
if (log != null)
{
- log.buf.AppendLine("Create PartSim for " + this.name);
- }
-
- this.parent = null;
- this.parentAttach = part.attachMode;
- this.fuelCrossFeed = this.part.fuelCrossFeed;
- this.noCrossFeedNodeKey = this.part.NoCrossFeedNodeKey;
- this.decoupledInStage = this.DecoupledInStage(this.part);
- this.isFuelLine = this.part.HasModule<CModuleFuelLine>();
- this.isFuelTank = this.part is FuelTank;
- this.isSepratron = this.IsSepratron();
- this.inverseStage = this.part.inverseStage;
- //MonoBehaviour.print("inverseStage = " + inverseStage);
-
- this.cost = this.part.GetCostWet();
+ log.buf.AppendLine("Parent part = " + (partSim.part.parent == null ? "null" : partSim.part.parent.partInfo.name));
+ log.buf.AppendLine("physicalSignificance = " + partSim.part.physicalSignificance);
+ log.buf.AppendLine("PhysicsSignificance = " + partSim.part.PhysicsSignificance);
+ }
// Work out if the part should have no physical significance
- this.isNoPhysics = this.part.HasModule<LaunchClamp>();
-
- if (isNoPhysics == false)
- {
- baseMass = part.mass;
- }
-
- if (SimManager.logOutput)
- {
- MonoBehaviour.print((this.isNoPhysics ? "Ignoring" : "Using") + " part.mass of " + this.part.mass);
- }
-
- for (int i = 0; i < part.Resources.Count; ++i)
- {
- PartResource resource = part.Resources[i];
+ // The root part is never "no physics"
+ partSim.isNoPhysics = partSim.part.physicalSignificance == Part.PhysicalSignificance.NONE ||
+ partSim.part.PhysicsSignificance == 1;
+
+ if (partSim.part.HasModule<LaunchClamp>())
+ {
+ partSim.realMass = 0d;
+ if (log != null) log.buf.AppendLine("Ignoring mass of launch clamp");
+ }
+ else
+ {
+ partSim.realMass = partSim.part.mass;
+ if (log != null) log.buf.AppendLine("Using part.mass of " + partSim.part.mass);
+ }
+
+ if (partSim.isFairing)
+ {
+ partSim.fairingMass = partSim.part.GetModuleMass((float)partSim.realMass);
+ }
+
+ for (int i = 0; i < partSim.part.Resources.Count; i++)
+ {
+ PartResource resource = partSim.part.Resources[i];
// Make sure it isn't NaN as this messes up the part mass and hence most of the values
// This can happen if a resource capacity is 0 and tweakable
if (!Double.IsNaN(resource.amount))
{
- if (SimManager.logOutput)
- {
- MonoBehaviour.print(resource.resourceName + " = " + resource.amount);
- }
-
- this.resources.Add(resource.info.id, resource.amount);
- this.resourceFlowStates.Add(resource.info.id, resource.flowState ? 1 : 0);
+ if (log != null)
+ log.buf.AppendLine(resource.resourceName + " = " + resource.amount);
+
+ partSim.resources.Add(resource.info.id, resource.amount);
+ partSim.resourceFlowStates.Add(resource.info.id, resource.flowState ? 1 : 0);
}
else
{
- MonoBehaviour.print(resource.resourceName + " is NaN. Skipping.");
- }
- }
-
- this.startMass = this.GetMass();
-
- this.hasVessel = (this.part.vessel != null);
- this.isLanded = this.hasVessel && this.part.vessel.Landed;
- if (this.hasVessel)
- {
- this.vesselName = this.part.vessel.vesselName;
- this.vesselType = this.part.vesselType;
- }
- this.initialVesselName = this.part.initialVesselName;
-
- this.hasMultiModeEngine = this.part.HasModule<MultiModeEngine>();
- this.hasModuleEnginesFX = this.part.HasModule<ModuleEnginesFX>();
- this.hasModuleEngines = this.part.HasModule<ModuleEngines>();
-
- this.isEngine = this.hasMultiModeEngine || this.hasModuleEnginesFX || this.hasModuleEngines;
-
- if (SimManager.logOutput)
- {
- MonoBehaviour.print("Created " + this.name + ". Decoupled in stage " + this.decoupledInStage);
- }
-
- return this;
+ if (log != null) log.buf.AppendLine(resource.resourceName + " is NaN. Skipping.");
+ }
+ }
+
+ partSim.hasVessel = (partSim.part.vessel != null);
+ partSim.isLanded = partSim.hasVessel && partSim.part.vessel.Landed;
+ if (partSim.hasVessel)
+ {
+ partSim.vesselName = partSim.part.vessel.vesselName;
+ partSim.vesselType = partSim.part.vesselType;
+ }
+ partSim.initialVesselName = partSim.part.initialVesselName;
+
+ partSim.hasMultiModeEngine = partSim.part.HasModule<MultiModeEngine>();
+ partSim.hasModuleEngines = partSim.part.HasModule<ModuleEngines>();
+
+ partSim.isEngine = partSim.hasMultiModeEngine || partSim.hasModuleEngines;
+
+ if (log != null) log.buf.AppendLine("Created " + partSim.name + ". Decoupled in stage " + partSim.decoupledInStage);
+
+ return partSim;
+ }
+
+ public ResourceContainer ResourceDrains
+ {
+ get
+ {
+ return resourceDrains;
+ }
}
public ResourceContainer Resources
{
- get { return this.resources; }
- }
-
- public ResourceContainer ResourceDrains
- {
- get { return this.resourceDrains; }
+ get
+ {
+ return resources;
+ }
}
public void CreateEngineSims(List<EngineSim> allEngines, double atmosphere, double mach, bool vectoredThrust, bool fullThrust, LogMsg log)
{
- bool correctThrust = SimManager.DoesEngineUseCorrectedThrust(this.part);
if (log != null)
{
log.buf.AppendLine("CreateEngineSims for " + this.name);
-
- foreach (PartModule partMod in this.part.Modules)
- {
+ for (int i = 0; i < this.part.Modules.Count; i++)
+ {
+ PartModule partMod = this.part.Modules[i];
log.buf.AppendLine("Module: " + partMod.moduleName);
}
-
- log.buf.AppendLine("correctThrust = " + correctThrust);
- }
-
- if (this.hasMultiModeEngine)
- {
- // A multi-mode engine has multiple ModuleEnginesFX but only one is active at any point
- // The mode of the engine is the engineID of the ModuleEnginesFX that is active
- string mode = this.part.GetModule<MultiModeEngine>().mode;
-
- List<ModuleEnginesFX> engines = part.GetModules<ModuleEnginesFX>();
-
+ }
+
+ if (hasMultiModeEngine)
+ {
+ // A multi-mode engine has multiple ModuleEngines but only one is active at any point
+ // The mode of the engine is the engineID of the ModuleEngines that is active
+ string mode = part.GetModule<MultiModeEngine>().mode;
+
+ List<ModuleEngines> engines = part.GetModules<ModuleEngines>();
for (int i = 0; i < engines.Count; ++i)
{
- ModuleEnginesFX engine = engines[i];
-
+ ModuleEngines engine = engines[i];
if (engine.engineID == mode)
{
- if (log != null)
- {
- log.buf.AppendLine("Module: " + engine.moduleName);
- }
+ if (log != null) log.buf.AppendLine("Module: " + engine.moduleName);
Vector3 thrustvec = this.CalculateThrustVector(vectoredThrust ? engine.thrustTransforms : null, log);
- EngineSim engineSim = EngineSim.GetPoolObject().Initialise(this,
+ EngineSim engineSim = EngineSim.New(
+ this,
atmosphere,
(float)mach,
engine.maxFuelFlow,
@@ -253,49 +248,48 @@
engine.useAtmCurve ? engine.atmCurve : null,
engine.useVelCurve ? engine.velCurve : null,
engine.currentThrottle,
+ engine.g,
engine.throttleLocked || fullThrust,
engine.propellants,
engine.isOperational,
engine.resultingThrust,
- engine.thrustTransforms);
+ engine.thrustTransforms,
+ log);
allEngines.Add(engineSim);
}
}
}
- else
- {
- if (this.hasModuleEngines)
- {
- List<ModuleEngines> engines = part.GetModules<ModuleEngines>();
- for (int i = 0; i < engines.Count; ++i)
- {
- ModuleEngines engine = engines[i];
- if (log != null)
- {
- log.buf.AppendLine("Module: " + engine.moduleName);
- }
-
- Vector3 thrustvec = this.CalculateThrustVector(vectoredThrust ? engine.thrustTransforms : null, log);
-
- EngineSim engineSim = EngineSim.GetPoolObject().Initialise(this,
- atmosphere,
- (float)mach,
- engine.maxFuelFlow,
- engine.minFuelFlow,
- engine.thrustPercentage,
- thrustvec,
- engine.atmosphereCurve,
- engine.atmChangeFlow,
- engine.useAtmCurve ? engine.atmCurve : null,
- engine.useVelCurve ? engine.velCurve : null,
- engine.currentThrottle,
- engine.throttleLocked || fullThrust,
- engine.propellants,
- engine.isOperational,
- engine.resultingThrust,
- engine.thrustTransforms);
- allEngines.Add(engineSim);
- }
+ else if (hasModuleEngines)
+ {
+ List<ModuleEngines> engines = part.GetModules<ModuleEngines>();
+ for (int i = 0; i < engines.Count; ++i)
+ {
+ ModuleEngines engine = engines[i];
+ if (log != null) log.buf.AppendLine("Module: " + engine.moduleName);
+
+ Vector3 thrustvec = this.CalculateThrustVector(vectoredThrust ? engine.thrustTransforms : null, log);
+
+ EngineSim engineSim = EngineSim.New(
+ this,
+ atmosphere,
+ (float)mach,
+ engine.maxFuelFlow,
+ engine.minFuelFlow,
+ engine.thrustPercentage,
+ thrustvec,
+ engine.atmosphereCurve,
+ engine.atmChangeFlow,
+ engine.useAtmCurve ? engine.atmCurve : null,
+ engine.useVelCurve ? engine.velCurve : null,
+ engine.currentThrottle,
+ engine.g,
+ engine.throttleLocked || fullThrust,
+ engine.propellants,
+ engine.isOperational,
+ engine.resultingThrust,
+ engine.thrustTransforms,
+ log);
+ allEngines.Add(engineSim);
}
}
@@ -305,184 +299,148 @@
}
}
- private Vector3 CalculateThrustVector(List<Transform> thrustTransforms, LogMsg log)
- {
- if (thrustTransforms == null)
- {
- return Vector3.forward;
- }
-
- Vector3 thrustvec = Vector3.zero;
- for (int i = 0; i < thrustTransforms.Count; ++i)
- {
- Transform trans = thrustTransforms[i];
-
- if (log != null)
- {
- log.buf.AppendFormat("Transform = ({0:g6}, {1:g6}, {2:g6}) length = {3:g6}\n", trans.forward.x, trans.forward.y, trans.forward.z, trans.forward.magnitude);
- }
-
- thrustvec -= trans.forward;
- }
-
- if (log != null)
- {
- log.buf.AppendFormat("ThrustVec = ({0:g6}, {1:g6}, {2:g6}) length = {3:g6}\n", thrustvec.x, thrustvec.y, thrustvec.z, thrustvec.magnitude);
- }
-
- thrustvec.Normalize();
-
- if (log != null)
- {
- log.buf.AppendFormat("ThrustVecN = ({0:g6}, {1:g6}, {2:g6}) length = {3:g6}\n", thrustvec.x, thrustvec.y, thrustvec.z, thrustvec.magnitude);
- }
-
- return thrustvec;
- }
-
- public void SetupParent(Dictionary<Part, PartSim> partSimLookup, LogMsg log)
- {
- if (this.part.parent != null)
- {
- this.parent = null;
- if (partSimLookup.TryGetValue(this.part.parent, out this.parent))
- {
- if (log != null)
- {
- log.buf.AppendLine("Parent part is " + this.parent.name + ":" + this.parent.partId);
- }
- }
- else
- {
- if (log != null)
- {
- log.buf.AppendLine("No PartSim for parent part (" + this.part.parent.partInfo.name + ")");
- }
- }
- }
- }
-
- public void SetupAttachNodes(Dictionary<Part, PartSim> partSimLookup, LogMsg log)
- {
- if (log != null)
- {
- log.buf.AppendLine("SetupAttachNodes for " + this.name + ":" + this.partId + "");
- }
-
- attachNodes.Clear();
-
- for (int i = 0; i < part.attachNodes.Count; ++i)
- {
- AttachNode attachNode = part.attachNodes[i];
-
- if (log != null)
- {
- log.buf.AppendLine("AttachNode " + attachNode.id + " = " + (attachNode.attachedPart != null ? attachNode.attachedPart.partInfo.name : "null"));
- }
-
- if (attachNode.attachedPart != null && attachNode.id != "Strut")
- {
- PartSim attachedSim;
- if (partSimLookup.TryGetValue(attachNode.attachedPart, out attachedSim))
- {
- if (log != null)
- {
- log.buf.AppendLine("Adding attached node " + attachedSim.name + ":" + attachedSim.partId + "");
- }
-
- attachNodes.Add(AttachNodeSim.GetPoolObject().Initialise(attachedSim, attachNode.id, attachNode.nodeType));
- }
- else
- {
- if (log != null)
- {
- log.buf.AppendLine("No PartSim for attached part (" + attachNode.attachedPart.partInfo.name + ")");
- }
- }
- }
- }
-
- for (int i = 0; i < part.fuelLookupTargets.Count; ++i)
- {
- Part p = part.fuelLookupTargets[i];
-
- if (p != null)
- {
- PartSim targetSim;
- if (partSimLookup.TryGetValue(p, out targetSim))
- {
- if (log != null)
- {
- log.buf.AppendLine("Fuel target: " + targetSim.name + ":" + targetSim.partId);
- }
-
- this.fuelTargets.Add(targetSim);
- }
- else
- {
- if (log != null)
- {
- log.buf.AppendLine("No PartSim for fuel target (" + p.name + ")");
- }
- }
- }
- }
- }
-
- private int DecoupledInStage(Part thePart, int stage = -1)
- {
- if (this.IsDecoupler(thePart))
- {
- if (thePart.inverseStage > stage)
- {
- stage = thePart.inverseStage;
- }
- }
-
- if (thePart.parent != null)
- {
- stage = this.DecoupledInStage(thePart.parent, stage);
- }
-
- return stage;
- }
-
- private bool IsDecoupler(Part thePart)
- {
- return thePart.HasModule<ModuleDecouple>() ||
- thePart.HasModule<ModuleAnchoredDecoupler>();
- }
-
- private bool IsActiveDecoupler(Part thePart)
- {
- return thePart.FindModulesImplementing<ModuleDecouple>().Any(mod => !mod.isDecoupled) ||
- thePart.FindModulesImplementing<ModuleAnchoredDecoupler>().Any(mod => !mod.isDecoupled);
- }
-
- private bool IsSepratron()
- {
- if (!this.part.ActivatesEvenIfDisconnected)
- {
- return false;
- }
-
- if (this.part is SolidRocket)
- {
- return true;
- }
-
- var modList = this.part.Modules.OfType<ModuleEngines>();
- if (modList.Count() == 0)
- {
- return false;
- }
-
- if (modList.First().throttleLocked)
- {
- return true;
- }
-
- return false;
+ public int DecouplerCount()
+ {
+ int count = 0;
+ PartSim partSim = this;
+ while (partSim != null)
+ {
+ if (partSim.isDecoupler)
+ {
+ count++;
+ }
+
+ partSim = partSim.parent;
+ }
+ return count;
+ }
+
+ public void DrainResources(double time)
+ {
+ //MonoBehaviour.print("DrainResources(" + name + ":" + partId + ", " + time + ")");
+ for (int i = 0; i < resourceDrains.Types.Count; ++i)
+ {
+ int type = resourceDrains.Types[i];
+
+ //MonoBehaviour.print("draining " + (time * resourceDrains[type]) + " " + ResourceContainer.GetResourceName(type));
+ resources.Add(type, -time * resourceDrains[type]);
+ //MonoBehaviour.print(ResourceContainer.GetResourceName(type) + " left = " + resources[type]);
+ }
+ }
+
+ public String DumpPartAndParentsToBuffer(StringBuilder buffer, String prefix)
+ {
+ if (parent != null)
+ {
+ prefix = parent.DumpPartAndParentsToBuffer(buffer, prefix) + " ";
+ }
+
+ DumpPartToBuffer(buffer, prefix);
+
+ return prefix;
+ }
+
+ public void DumpPartToBuffer(StringBuilder buffer, String prefix, List<PartSim> allParts = null)
+ {
+ buffer.Append(prefix);
+ buffer.Append(name);
+ buffer.AppendFormat(":[id = {0:d}, decouple = {1:d}, invstage = {2:d}", partId, decoupledInStage, inverseStage);
+
+ //buffer.AppendFormat(", vesselName = '{0}'", vesselName);
+ //buffer.AppendFormat(", vesselType = {0}", SimManager.GetVesselTypeString(vesselType));
+ //buffer.AppendFormat(", initialVesselName = '{0}'", initialVesselName);
+
+ buffer.AppendFormat(", isNoPhys = {0}", isNoPhysics);
+ buffer.AppendFormat(", baseMass = {0}", baseMass);
+ buffer.AppendFormat(", baseMassForCoM = {0}", baseMassForCoM);
+
+ buffer.AppendFormat(", fuelCF = {0}", fuelCrossFeed);
+ buffer.AppendFormat(", noCFNKey = '{0}'", noCrossFeedNodeKey);
+
+ buffer.AppendFormat(", isSep = {0}", isSepratron);
+
+ for (int i = 0; i < resources.Types.Count; i++)
+ {
+ int type = resources.Types[i];
+ buffer.AppendFormat(", {0} = {1:g6}", ResourceContainer.GetResourceName(type), resources[type]);
+ }
+
+ if (attachNodes.Count > 0)
+ {
+ buffer.Append(", attached = <");
+ attachNodes[0].DumpToBuffer(buffer);
+ for (int i = 1; i < attachNodes.Count; i++)
+ {
+ buffer.Append(", ");
+ attachNodes[i].DumpToBuffer(buffer);
+ }
+ buffer.Append(">");
+ }
+
+ // Add more info here
+
+ buffer.Append("]\n");
+
+ if (allParts != null)
+ {
+ String newPrefix = prefix + " ";
+ for (int i = 0; i < allParts.Count; i++)
+ {
+ PartSim partSim = allParts[i];
+ if (partSim.parent == this)
+ partSim.DumpPartToBuffer(buffer, newPrefix, allParts);
+ }
+ }
+ }
+
+ public bool EmptyOf(HashSet<int> types)
+ {
+ foreach (int type in types)
+ {
+ if (resources.HasType(type) && resourceFlowStates[type] != 0 && resources[type] > SimManager.RESOURCE_PART_EMPTY_THRESH)
+ return false;
+ }
+
+ return true;
+ }
+
+ public double GetMass(int currentStage, bool forCoM = false)
+ {
+ if (decoupledInStage >= currentStage)
+ return 0d;
+
+ double mass = forCoM ? baseMassForCoM : baseMass;
+
+ for (int i = 0; i < resources.Types.Count; ++i)
+ {
+ mass += resources.GetResourceMass(resources.Types[i]);
+ }
+
+ if (hasVessel == false && isFairing && currentStage > inverseStage)
+ {
+ mass += fairingMass;
+ }
+ else if (hasVessel && isFairing && currentStage <= inverseStage)
+ {
+ mass -= fairingMass;
+ }
+
+ return mass;
+ }
+
+ public double GetCost(int currentStage)
+ {
+ if (decoupledInStage >= currentStage)
+ return 0d;
+
+ double cost = baseCost;
+
+ for (int i = 0; i < resources.Types.Count; ++i)
+ {
+ cost += resources.GetResourceCost(resources.Types[i]);
+ }
+
+ return cost;
}
public void ReleasePart()
@@ -493,68 +451,55 @@
// All functions below this point must not rely on the part member (it may be null)
//
- public HashSet<PartSim> GetSourceSet(int type, List<PartSim> allParts, HashSet<PartSim> visited, LogMsg log, String indent)
+ public void GetSourceSet(int type, List<PartSim> allParts, HashSet<PartSim> visited, HashSet<PartSim> allSources, LogMsg log, String indent)
{
if (log != null)
{
- log.buf.AppendLine(indent + "GetSourceSet(" + ResourceContainer.GetResourceName(type) + ") for " + this.name + ":" + this.partId);
+ log.buf.AppendLine(indent + "GetSourceSet(" + ResourceContainer.GetResourceName(type) + ") for " + name + ":" + partId);
indent += " ";
}
- HashSet<PartSim> allSources = new HashSet<PartSim>();
- HashSet<PartSim> partSources = null;
-
- // Rule 1: Each part can be only visited once, If it is visited for second time in particular search it returns empty list.
+ // Rule 1: Each part can be only visited once, If it is visited for second time in particular search it returns as is.
if (visited.Contains(this))
{
- if (log != null)
- {
- log.buf.AppendLine(indent + "Returning empty set, already visited (" + this.name + ":" + this.partId + ")");
- }
-
- return allSources;
- }
-
- //if (log != null)
- // log.buf.AppendLine(indent + "Adding this to visited");
+ if (log != null) log.buf.AppendLine(indent + "Returning empty set, already visited (" + name + ":" + partId + ")");
+ return;
+ }
+
+ if (log != null) log.buf.AppendLine(indent + "Adding this to visited");
visited.Add(this);
// Rule 2: Part performs scan on start of every fuel pipe ending in it. This scan is done in order in which pipes were installed.
// Then it makes an union of fuel tank sets each pipe scan returned. If the resulting list is not empty, it is returned as result.
- //MonoBehaviour.print("foreach fuel line");
- for (int i = 0; i < fuelTargets.Count; ++i)
- {
- PartSim partSim = fuelTargets[i];
-
- if (visited.Contains(partSim))
- {
- //if (log != null)
- // log.buf.AppendLine(indent + "Fuel target already visited, skipping (" + partSim.name + ":" + partSim.partId + ")");
- }
- else
- {
- //if (log != null)
- // log.buf.AppendLine(indent + "Adding fuel target as source (" + partSim.name + ":" + partSim.partId + ")");
-
- partSources = partSim.GetSourceSet(type, allParts, visited, log, indent);
- if (partSources.Count > 0)
- {
- allSources.UnionWith(partSources);
- partSources.Clear();
- }
- }
- }
-
- if (allSources.Count > 0)
- {
- if (log != null)
- {
- log.buf.AppendLine(indent + "Returning " + allSources.Count + " fuel target sources (" + this.name + ":" + this.partId + ")");
- }
-
- return allSources;
- }
+ //MonoBehaviour.print("for each fuel line");
+
+ int lastCount = allSources.Count;
+
+ for (int i = 0; i < this.fuelTargets.Count; i++)
+ {
+ PartSim partSim = this.fuelTargets[i];
+ if (partSim != null)
+ {
+ if (visited.Contains(partSim))
+ {
+ if (log != null) log.buf.AppendLine(indent + "Fuel target already visited, skipping (" + partSim.name + ":" + partSim.partId + ")");
+ }
+ else
+ {
+ if (log != null) log.buf.AppendLine(indent + "Adding fuel target as source (" + partSim.name + ":" + partSim.partId + ")");
+
+ partSim.GetSourceSet(type, allParts, visited, allSources, log, indent);
+ }
+ }
+ }
+
+ if (allSources.Count > lastCount)
+ {
+ if (log != null) log.buf.AppendLine(indent + "Returning " + (allSources.Count - lastCount) + " fuel target sources (" + this.name + ":" + this.partId + ")");
+ return;
+ }
+
// Rule 3: This rule has been removed and merged with rules 4 and 7 to fix issue with fuel tanks with disabled crossfeed
@@ -563,49 +508,40 @@
// skip the points on the side where multiple points are. [Experiment]
// Again, the part creates union of scan lists from each of its neighbor and if it is not empty, returns this list.
// The order in which mount points of a part are scanned appears to be fixed and defined by the part specification file. [Experiment]
- if (this.fuelCrossFeed)
- {
- //MonoBehaviour.print("foreach attach node");
- for (int i = 0; i < attachNodes.Count; ++i)
- {
- AttachNodeSim attachSim = attachNodes[i];
-
+ if (fuelCrossFeed)
+ {
+ lastCount = allSources.Count;
+ //MonoBehaviour.print("for each attach node");
+ for (int i = 0; i < this.attachNodes.Count; i++)
+ {
+ AttachNodeSim attachSim = this.attachNodes[i];
if (attachSim.attachedPartSim != null)
{
if (attachSim.nodeType == AttachNode.NodeType.Stack)
{
- if (!(this.noCrossFeedNodeKey != null && this.noCrossFeedNodeKey.Length > 0 && attachSim.id.Contains(this.noCrossFeedNodeKey)))
+ if (
+ !(this.noCrossFeedNodeKey != null && this.noCrossFeedNodeKey.Length > 0 &&
+ attachSim.id.Contains(this.noCrossFeedNodeKey)))
{
if (visited.Contains(attachSim.attachedPartSim))
{
- //if (log != null)
- // log.buf.AppendLine(indent + "Attached part already visited, skipping (" + attachSim.attachedPartSim.name + ":" + attachSim.attachedPartSim.partId + ")");
+ if (log != null) log.buf.AppendLine(indent + "Attached part already visited, skipping (" + attachSim.attachedPartSim.name + ":" + attachSim.attachedPartSim.partId + ")");
}
else
{
- //if (log != null)
- // log.buf.AppendLine(indent + "Adding attached part as source (" + attachSim.attachedPartSim.name + ":" + attachSim.attachedPartSim.partId + ")");
-
- partSources = attachSim.attachedPartSim.GetSourceSet(type, allParts, visited, log, indent);
- if (partSources.Count > 0)
- {
- allSources.UnionWith(partSources);
- partSources.Clear();
- }
+ if (log != null) log.buf.AppendLine(indent + "Adding attached part as source (" + attachSim.attachedPartSim.name + ":" + attachSim.attachedPartSim.partId + ")");
+
+ attachSim.attachedPartSim.GetSourceSet(type, allParts, visited, allSources, log, indent);
}
}
}
}
}
- if (allSources.Count > 0)
- {
- if (log != null)
- {
- log.buf.AppendLine(indent + "Returning " + allSources.Count + " attached sources (" + this.name + ":" + this.partId + ")");
- }
-
- return allSources;
+ if (allSources.Count > lastCount)
+ {
+ if (log != null) log.buf.AppendLine(indent + "Returning " + (allSources.Count - lastCount) + " attached sources (" + this.name + ":" + this.partId + ")");
+ return;
}
}
@@ -613,80 +549,143 @@
// type was not disabled [Experiment]) and it contains fuel, it returns itself.
// Rule 6: If the part is fuel container for searched type of fuel (i.e. it has capability to contain that type of fuel and the fuel
// type was not disabled) but it does not contain the requested fuel, it returns empty list. [Experiment]
- if (this.resources.HasType(type) && this.resourceFlowStates[type] != 0)
- {
- if (this.resources[type] > SimManager.RESOURCE_MIN)
+ if (resources.HasType(type) && resourceFlowStates[type] != 0)
+ {
+ if (resources[type] > SimManager.RESOURCE_MIN)
{
allSources.Add(this);
- if (log != null)
- {
- log.buf.AppendLine(indent + "Returning enabled tank as only source (" + this.name + ":" + this.partId + ")");
- }
- }
-
- return allSources;
+ if (log != null) log.buf.AppendLine(indent + "Returning enabled tank as only source (" + name + ":" + partId + ")");
+ }
+
+ return;
+ }
+ else
+ {
+ if (log != null) log.buf.AppendLine(indent + "Not fuel tank or disabled. HasType = " + resources.HasType(type) + " FlowState = " + resourceFlowStates[type]);
}
// Rule 7: If the part is radially attached to another part and it is child of that part in the ship's tree structure, it scans its
// parent and returns whatever the parent scan returned. [Experiment] [Experiment]
- if (this.parent != null && this.parentAttach == AttachModes.SRF_ATTACH)
- {
- if (this.fuelCrossFeed)
- {
- if (visited.Contains(this.parent))
- {
- //if (log != null)
- // log.buf.AppendLine(indent + "Parent part already visited, skipping (" + parent.name + ":" + parent.partId + ")");
+ if (parent != null && parentAttach == AttachModes.SRF_ATTACH)
+ {
+ if (fuelCrossFeed)
+ {
+ if (visited.Contains(parent))
+ {
+ if (log != null) log.buf.AppendLine(indent + "Parent part already visited, skipping (" + parent.name + ":" + parent.partId + ")");
}
else
{
- allSources = this.parent.GetSourceSet(type, allParts, visited, log, indent);
- if (allSources.Count > 0)
+ lastCount = allSources.Count;
+ this.parent.GetSourceSet(type, allParts, visited, allSources, log, indent);
+ if (allSources.Count > lastCount)
{
- if (log != null)
- {
- log.buf.AppendLine(indent + "Returning " + allSources.Count + " parent sources (" + this.name + ":" + this.partId + ")");
- }
-
- return allSources;
+ if (log != null) log.buf.AppendLine(indent + "Returning " + (allSources.Count - lastCount) + " parent sources (" + this.name + ":" + this.partId + ")");
+ return;
}
}
}
}
// Rule 8: If all preceding rules failed, part returns empty list.
- //if (log != null)
- // log.buf.AppendLine(indent + "Returning empty set, no sources found (" + name + ":" + partId + ")");
-
- return allSources;
+ if (log != null) log.buf.AppendLine(indent + "Returning empty set, no sources found (" + name + ":" + partId + ")");
+
+ return;
+ }
+
+ public double GetStartMass()
+ {
+ return startMass;
}
public void RemoveAttachedParts(HashSet<PartSim> partSims)
{
// Loop through the attached parts
- for (int i = 0; i < attachNodes.Count; ++i)
- {
- AttachNodeSim attachSim = attachNodes[i];
-
+ for (int i = 0; i < this.attachNodes.Count; i++)
+ {
+ AttachNodeSim attachSim = this.attachNodes[i];
// If the part is in the set then "remove" it by clearing the PartSim reference
if (partSims.Contains(attachSim.attachedPartSim))
{
attachSim.attachedPartSim = null;
}
}
- }
-
- public void DrainResources(double time)
- {
- //MonoBehaviour.print("DrainResources(" + name + ":" + partId + ", " + time + ")");
- for (int i = 0; i < resourceDrains.Types.Count; ++i)
- {
- int type = resourceDrains.Types[i];
-
- //MonoBehaviour.print("draining " + (time * resourceDrains[type]) + " " + ResourceContainer.GetResourceName(type));
- this.resources.Add(type, -time * this.resourceDrains[type]);
- //MonoBehaviour.print(ResourceContainer.GetResourceName(type) + " left = " + resources[type]);
+
+ // Loop through the fuel targets (fuel line sources)
+ for (int i = 0; i < this.fuelTargets.Count; i++)
+ {
+ PartSim fuelTargetSim = this.fuelTargets[i];
+ // If the part is in the set then "remove" it by clearing the PartSim reference
+ if (fuelTargetSim != null && partSims.Contains(fuelTargetSim))
+ {
+ this.fuelTargets[i] = null;
+ }
+ }
+ }
+
+ public void SetupAttachNodes(Dictionary<Part, PartSim> partSimLookup, LogMsg log)
+ {
+ if (log != null) log.buf.AppendLine("SetupAttachNodes for " + name + ":" + partId + "");
+
+ attachNodes.Clear();
+
+ for (int i = 0; i < part.attachNodes.Count; ++i)
+ {
+ AttachNode attachNode = part.attachNodes[i];
+
+ if (log != null) log.buf.AppendLine("AttachNode " + attachNode.id + " = " + (attachNode.attachedPart != null ? attachNode.attachedPart.partInfo.name : "null"));
+
+ if (attachNode.attachedPart != null && attachNode.id != "Strut")
+ {
+ PartSim attachedSim;
+ if (partSimLookup.TryGetValue(attachNode.attachedPart, out attachedSim))
+ {
+ if (log != null) log.buf.AppendLine("Adding attached node " + attachedSim.name + ":" + attachedSim.partId + "");
+
+ attachNodes.Add(AttachNodeSim.New(attachedSim, attachNode.id, attachNode.nodeType));
+ }
+ else
+ {
+ if (log != null) log.buf.AppendLine("No PartSim for attached part (" + attachNode.attachedPart.partInfo.name + ")");
+ }
+ }
+ }
+
+ for (int i = 0; i < part.fuelLookupTargets.Count; ++i)
+ {
+ Part p = part.fuelLookupTargets[i];
+
+ if (p != null)
+ {
+ PartSim targetSim;
+ if (partSimLookup.TryGetValue(p, out targetSim))
+ {
+ if (log != null) log.buf.AppendLine("Fuel target: " + targetSim.name + ":" + targetSim.partId);
+
+ fuelTargets.Add(targetSim);
+ }
+ else
+ {
+ if (log != null) log.buf.AppendLine("No PartSim for fuel target (" + p.name + ")");
+ }
+ }
+ }
+ }
+
+ public void SetupParent(Dictionary<Part, PartSim> partSimLookup, LogMsg log)
+ {
+ if (part.parent != null)
+ {
+ parent = null;
+ if (partSimLookup.TryGetValue(part.parent, out parent))
+ {
+ if (log != null) log.buf.AppendLine("Parent part is " + parent.name + ":" + parent.partId);
+ }
+ else
+ {
+ if (log != null) log.buf.AppendLine("No PartSim for parent part (" + part.parent.partInfo.name + ")");
+ }
}
}
@@ -699,9 +698,9 @@
{
int type = resourceDrains.Types[i];
- if (this.resourceDrains[type] > 0)
- {
- time = Math.Min(time, this.resources[type] / this.resourceDrains[type]);
+ if (resourceDrains[type] > 0)
+ {
+ time = Math.Min(time, resources[type] / resourceDrains[type]);
//MonoBehaviour.print("type = " + ResourceContainer.GetResourceName(type) + " amount = " + resources[type] + " rate = " + resourceDrains[type] + " time = " + time);
}
}
@@ -711,111 +710,84 @@
return time;
}
- public bool EmptyOf(HashSet<int> types)
- {
- foreach (int type in types)
- {
- if (this.resources.HasType(type) && this.resourceFlowStates[type] != 0 && (double)this.resources[type] > SimManager.RESOURCE_MIN)
- {
- return false;
- }
- }
-
- return true;
- }
-
- public int DecouplerCount()
- {
- int count = 0;
- PartSim partSim = this;
- while (partSim != null)
- {
- if (partSim.isDecoupler)
- {
- count++;
- }
-
- partSim = partSim.parent;
- }
- return count;
- }
-
- public double GetStartMass()
- {
- return this.startMass;
- }
-
- public double GetMass()
- {
- double mass = this.baseMass;
-
- for (int i = 0; i < resources.Types.Count; ++i)
- {
- mass += this.resources.GetResourceMass(resources.Types[i]);
- }
-
- return mass;
- }
-
- public String DumpPartAndParentsToBuffer(StringBuilder buffer, String prefix)
- {
- if (this.parent != null)
- {
- prefix = this.parent.DumpPartAndParentsToBuffer(buffer, prefix) + " ";
- }
-
- this.DumpPartToBuffer(buffer, prefix);
-
- return prefix;
- }
-
- public void DumpPartToBuffer(StringBuilder buffer, String prefix, List<PartSim> allParts = null)
- {
- buffer.Append(prefix);
- buffer.Append(this.name);
- buffer.AppendFormat(":[id = {0:d}, decouple = {1:d}, invstage = {2:d}", this.partId, this.decoupledInStage, this.inverseStage);
-
- buffer.AppendFormat(", vesselName = '{0}'", this.vesselName);
- buffer.AppendFormat(", vesselType = {0}", SimManager.GetVesselTypeString(this.vesselType));
- buffer.AppendFormat(", initialVesselName = '{0}'", this.initialVesselName);
-
- buffer.AppendFormat(", fuelCF = {0}", this.fuelCrossFeed);
- buffer.AppendFormat(", noCFNKey = '{0}'", this.noCrossFeedNodeKey);
-
- buffer.AppendFormat(", isSep = {0}", this.isSepratron);
-
- foreach (int type in this.resources.Types)
- {
- buffer.AppendFormat(", {0} = {1:g6}", ResourceContainer.GetResourceName(type), this.resources[type]);
- }
-
- if (this.attachNodes.Count > 0)
- {
- buffer.Append(", attached = <");
- this.attachNodes[0].DumpToBuffer(buffer);
- for (int i = 1; i < this.attachNodes.Count; i++)
- {
- buffer.Append(", ");
- this.attachNodes[i].DumpToBuffer(buffer);
- }
- buffer.Append(">");
- }
-
- // Add more info here
-
- buffer.Append("]\n");
-
- if (allParts != null)
- {
- String newPrefix = prefix + " ";
- foreach (PartSim partSim in allParts)
- {
- if (partSim.parent == this)
- {
- partSim.DumpPartToBuffer(buffer, newPrefix, allParts);
- }
- }
- }
+ private Vector3 CalculateThrustVector(List<Transform> thrustTransforms, LogMsg log)
+ {
+ if (thrustTransforms == null)
+ {
+ return Vector3.forward;
+ }
+
+ Vector3 thrustvec = Vector3.zero;
+ for (int i = 0; i < thrustTransforms.Count; ++i)
+ {
+ Transform trans = thrustTransforms[i];
+
+ if (log != null) log.buf.AppendFormat("Transform = ({0:g6}, {1:g6}, {2:g6}) length = {3:g6}\n", trans.forward.x, trans.forward.y, trans.forward.z, trans.forward.magnitude);
+
+ thrustvec -= trans.forward;
+ }
+
+ if (log != null) log.buf.AppendFormat("ThrustVec = ({0:g6}, {1:g6}, {2:g6}) length = {3:g6}\n", thrustvec.x, thrustvec.y, thrustvec.z, thrustvec.magnitude);
+
+ thrustvec.Normalize();
+
+ if (log != null) log.buf.AppendFormat("ThrustVecN = ({0:g6}, {1:g6}, {2:g6}) length = {3:g6}\n", thrustvec.x, thrustvec.y, thrustvec.z, thrustvec.magnitude);
+
+ return thrustvec;
+ }
+
+ private int DecoupledInStage(Part thePart, int stage = -1)
+ {
+ if (IsDecoupler(thePart) && thePart.inverseStage > stage)
+ stage = thePart.inverseStage;
+
+ if (thePart.parent != null)
+ stage = DecoupledInStage(thePart.parent, stage);
+
+ return stage;
+ }
+
+ private bool IsActiveDecoupler(Part thePart)
+ {
+ return thePart.FindModulesImplementing<ModuleDecouple>().Any(mod => !mod.isDecoupled) ||
+ thePart.FindModulesImplementing<ModuleAnchoredDecoupler>().Any(mod => !mod.isDecoupled);
+ }
+
+ private bool IsDecoupler(Part thePart)
+ {
+ return thePart.HasModule<ModuleDecouple>() ||
+ thePart.HasModule<ModuleAnchoredDecoupler>();
+ }
+
+ private bool IsFairing(Part thePart)
+ {
+ return thePart.HasModule<ModuleProceduralFairing>();
+ }
+
+ private bool IsSepratron()
+ {
+ if (!part.ActivatesEvenIfDisconnected)
+ {
+ return false;
+ }
+
+ if (part is SolidRocket)
+ {
+ return true;
+ }
+
+ IEnumerable<ModuleEngines> modList = part.Modules.OfType<ModuleEngines>();
+ if (modList.Count() == 0)
+ {
+ return false;
+ }
+
+ if (modList.First().throttleLocked)
+ {
+ return true;
+ }
+
+ return false;
}
}
}
--- a/KerbalEngineer/VesselSimulator/ResourceContainer.cs
+++ b/KerbalEngineer/VesselSimulator/ResourceContainer.cs
@@ -19,6 +19,7 @@
#region Using Directives
+using System;
using System.Collections;
using System.Collections.Generic;
@@ -30,15 +31,17 @@
{
public class ResourceContainer
{
- private Hashtable resources = new Hashtable();
+ private Dictionary<int, double> resources = new Dictionary<int, double>();
+ private List<int> types = new List<int>();
public double this[int type]
{
get
{
- if (this.resources.ContainsKey(type))
+ double value;
+ if (this.resources.TryGetValue(type, out value))
{
- return (double)this.resources[type];
+ return value;
}
return 0d;
@@ -52,6 +55,7 @@
else
{
this.resources.Add(type, value);
+ this.types.Add(type);
}
}
}
@@ -60,13 +64,6 @@
{
get
{
- List<int> types = new List<int>();
-
- foreach (int key in this.resources.Keys)
- {
- types.Add(key);
- }
-
return types;
}
}
@@ -92,7 +89,7 @@
{
foreach (int type in this.resources.Keys)
{
- if ((double)this.resources[type] > SimManager.RESOURCE_MIN)
+ if (this.resources[type] > SimManager.RESOURCE_MIN)
{
return false;
}
@@ -111,7 +108,7 @@
{
foreach (int type in types)
{
- if (this.HasType(type) && (double)this.resources[type] > SimManager.RESOURCE_MIN)
+ if (this.HasType(type) && this.resources[type] > SimManager.RESOURCE_MIN)
{
return false;
}
@@ -124,17 +121,19 @@
{
if (this.resources.ContainsKey(type))
{
- this.resources[type] = (double)this.resources[type] + amount;
+ this.resources[type] = this.resources[type] + amount;
}
else
{
this.resources.Add(type, amount);
+ this.types.Add(type);
}
}
public void Reset()
{
this.resources.Clear();
+ this.types.Clear();
}
public void Debug()
@@ -148,7 +147,13 @@
public double GetResourceMass(int type)
{
double density = GetResourceDensity(type);
- return density == 0d ? 0d : (double)this.resources[type] * density;
+ return density == 0d ? 0d : this.resources[type] * density;
+ }
+
+ public double GetResourceCost(int type)
+ {
+ double unitCost = GetResourceUnitCost(type);
+ return unitCost == 0d ? 0d : this.resources[type] * unitCost;
}
public static ResourceFlowMode GetResourceFlowMode(int type)
@@ -170,5 +175,10 @@
{
return PartResourceLibrary.Instance.GetDefinition(type).name;
}
+
+ public static double GetResourceUnitCost(int type)
+ {
+ return PartResourceLibrary.Instance.GetDefinition(type).unitCost;
+ }
}
}
--- a/KerbalEngineer/VesselSimulator/SimManager.cs
+++ b/KerbalEngineer/VesselSimulator/SimManager.cs
@@ -35,6 +35,7 @@
#region Constants
public const double RESOURCE_MIN = 0.0001;
+ public const double RESOURCE_PART_EMPTY_THRESH = 0.01;
#endregion
--- a/KerbalEngineer/VesselSimulator/Simulation.cs
+++ b/KerbalEngineer/VesselSimulator/Simulation.cs
@@ -42,17 +42,17 @@
private List<EngineSim> allEngines = new List<EngineSim>();
private List<PartSim> allFuelLines = new List<PartSim>();
private List<PartSim> allParts = new List<PartSim>();
- private Dictionary<Part, PartSim> partSimLookup = new Dictionary<Part, PartSim>();
private double atmosphere;
private int currentStage;
private double currentisp;
+ private HashSet<PartSim> decoupledParts = new HashSet<PartSim>();
private bool doingCurrent;
- private List<PartSim> dontStageParts = new List<PartSim>();
- List<List<PartSim>> dontStagePartsLists = new List<List<PartSim>>();
- private HashSet<PartSim> drainingParts = new HashSet<PartSim>();
- private HashSet<int> drainingResources = new HashSet<int>();
- private HashSet<PartSim> decoupledParts = new HashSet<PartSim>();
+ private List<PartSim> dontStageParts;
+ private List<List<PartSim>> dontStagePartsLists = new List<List<PartSim>>();
+ private HashSet<PartSim> drainingParts;
+ private HashSet<int> drainingResources;
private double gravity;
+ private Dictionary<Part, PartSim> partSimLookup;
private int lastStage;
private List<Part> partList = new List<Part>();
@@ -78,6 +78,17 @@
public Simulation()
{
+ this.allParts = new List<PartSim>();
+ this.allFuelLines = new List<PartSim>();
+ this.drainingParts = new HashSet<PartSim>();
+ this.allEngines = new List<EngineSim>();
+ this.activeEngines = new List<EngineSim>();
+ this.drainingResources = new HashSet<int>();
+ this.totalStageThrustForce = new ForceAccumulator();
+
+ // A dictionary for fast lookup of Part->PartSim during the preparation phase
+ partSimLookup = new Dictionary<Part, PartSim>();
+
if (SimManager.logOutput)
{
MonoBehaviour.print("Simulation created");
@@ -91,7 +102,7 @@
double mass = 0d;
for (int i = 0; i < allParts.Count; ++i) {
- mass += allParts[i].GetMass();
+ mass += allParts[i].GetMass(currentStage);
}
return mass;
@@ -107,7 +118,7 @@
for (int i = 0; i < allParts.Count; ++i)
{
PartSim partSim = allParts[i];
- vectorAverager.Add(partSim.centerOfMass, partSim.GetMass());
+ vectorAverager.Add(partSim.centerOfMass, partSim.GetMass(currentStage, true));
}
return vectorAverager.Get();
@@ -127,6 +138,7 @@
log.buf.AppendLine("PrepareSimulation started");
dumpTree = true;
}
+ this._timer.Reset();
this._timer.Start();
// Store the parameters in members for ease of access in other functions
@@ -135,6 +147,7 @@
this.atmosphere = theAtmosphere;
this.mach = theMach;
this.lastStage = Staging.lastStage;
+ this.maxMach = 1.0f;
//MonoBehaviour.print("lastStage = " + lastStage);
// Clear the lists for our simulation parts
@@ -145,10 +158,6 @@
activeEngines.Clear();
drainingResources.Clear();
- PartSim.ReleaseAll();
- EngineSim.ReleaseAll();
- AttachNodeSim.ReleaseAll();
-
// A dictionary for fast lookup of Part->PartSim during the preparation phase
partSimLookup.Clear();
@@ -157,7 +166,7 @@
this.vesselName = this.partList[0].vessel.vesselName;
this.vesselType = this.partList[0].vessel.vesselType;
}
-
+ //MonoBehaviour.print("PrepareSimulation pool size = " + PartSim.pool.Count());
// First we create a PartSim for each Part (giving each a unique id)
int partId = 1;
for (int i = 0; i < partList.Count; ++i)
@@ -175,7 +184,7 @@
}
// Create the PartSim
- PartSim partSim = PartSim.GetPoolObject().Initialise(part, partId, this.atmosphere, log);
+ PartSim partSim = PartSim.New(part, partId, this.atmosphere, log);
// Add it to the Part lookup dictionary and the necessary lists
partSimLookup.Add(part, partSim);
@@ -201,8 +210,9 @@
// Now that all the PartSims have been created we can do any set up that needs access to other parts
// First we set up all the parent links
- foreach (PartSim partSim in this.allParts)
- {
+ for (int i = 0; i < this.allParts.Count; i++)
+ {
+ PartSim partSim = this.allParts[i];
partSim.SetupParent(partSimLookup, log);
}
@@ -280,7 +290,7 @@
return true;
}
-
+
// This function runs the simulation and returns a newly created array of Stage objects
public Stage[] RunSimulation()
{
@@ -289,6 +299,7 @@
MonoBehaviour.print("RunSimulation started");
}
+ this._timer.Reset();
this._timer.Start();
LogMsg log = null;
@@ -300,7 +311,6 @@
// Start with the last stage to simulate
// (this is in a member variable so it can be accessed by AllowedToStage and ActivateStage)
this.currentStage = this.lastStage;
-
// Work out which engines would be active if just doing the staging and if this is different to the
// currently active engines then generate an extra stage
// Loop through all the engines
@@ -373,6 +383,7 @@
// Create the array of stages that will be returned
Stage[] stages = new Stage[this.currentStage + 1];
+ int startStage = currentStage;
// Loop through the stages
while (this.currentStage >= 0)
@@ -380,7 +391,6 @@
if (log != null)
{
log.buf.AppendLine("Simulating stage " + this.currentStage);
- log.buf.AppendLine("ShipMass = " + this.ShipMass);
log.Flush();
this._timer.Reset();
this._timer.Start();
@@ -389,13 +399,18 @@
// Update active engines and resource drains
this.UpdateResourceDrains();
+ // Update the masses of the parts to correctly handle "no physics" parts
+ this.stageStartMass = this.UpdatePartMasses();
+
+ if (log != null)
+ this.allParts[0].DumpPartToBuffer(log.buf, "", this.allParts);
+
// Create the Stage object for this stage
Stage stage = new Stage();
this.stageTime = 0d;
this.vecStageDeltaV = Vector3.zero;
- this.stageStartMass = this.ShipMass;
this.stageStartCom = this.ShipCom;
this.stepStartMass = this.stageStartMass;
@@ -405,11 +420,11 @@
// Store various things in the Stage object
stage.thrust = this.totalStageThrust;
- //MonoBehaviour.print("stage.thrust = " + stage.thrust);
+ if (log != null) log.buf.AppendLine("stage.thrust = " + stage.thrust);
stage.thrustToWeight = this.totalStageThrust / (this.stageStartMass * this.gravity);
stage.maxThrustToWeight = stage.thrustToWeight;
- //MonoBehaviour.print("StageMass = " + stageStartMass);
- //MonoBehaviour.print("Initial maxTWR = " + stage.maxThrustToWeight);
+ if (log != null) log.buf.AppendLine("StageMass = " + stageStartMass);
+ if (log != null) log.buf.AppendLine("Initial maxTWR = " + stage.maxThrustToWeight);
stage.actualThrust = this.totalStageActualThrust;
stage.actualThrustToWeight = this.totalStageActualThrust / (this.stageStartMass * this.gravity);
@@ -434,17 +449,31 @@
stage.thrustOffsetAngle = Math.Asin(sinThrustOffsetAngle) * 180 / Math.PI;
- // Calculate the cost and mass of this stage and add all engines and tanks that are decoupled
- // in the next stage to the dontStageParts list
+ // Calculate the total cost of the vessel at this point
+ stage.totalCost = 0d;
for (int i = 0; i < allParts.Count; ++i)
{
- PartSim partSim = allParts[i];
-
- if (partSim.decoupledInStage == this.currentStage - 1)
- {
- stage.cost += partSim.cost;
- stage.mass += partSim.GetStartMass();
- }
+ if (this.currentStage > allParts[i].decoupledInStage)
+ stage.totalCost += allParts[i].GetCost(currentStage);
+ }
+
+ // The total mass is simply the mass at the start of the stage
+ stage.totalMass = this.stageStartMass;
+
+ // If we have done a previous stage
+ if (currentStage < startStage)
+ {
+ // Calculate what the previous stage's mass and cost were by subtraction
+ Stage prev = stages[currentStage + 1];
+ prev.cost = prev.totalCost - stage.totalCost;
+ prev.mass = prev.totalMass - stage.totalMass;
+ }
+
+ // The above code will never run for the last stage so set those directly
+ if (currentStage == 0)
+ {
+ stage.cost = stage.totalCost;
+ stage.mass = stage.totalMass;
}
this.dontStageParts = dontStagePartsLists[this.currentStage];
@@ -456,8 +485,9 @@
if (this.dontStageParts.Count > 0)
{
log.buf.AppendLine("Parts preventing staging:");
- foreach (PartSim partSim in this.dontStageParts)
- {
+ for (int i = 0; i < this.dontStageParts.Count; i++)
+ {
+ PartSim partSim = this.dontStageParts[i];
partSim.DumpPartToBuffer(log.buf, "");
}
}
@@ -468,6 +498,7 @@
log.Flush();
}
+
// Now we will loop until we are allowed to stage
int loopCounter = 0;
@@ -475,7 +506,6 @@
{
loopCounter++;
//MonoBehaviour.print("loop = " + loopCounter);
-
// Calculate how long each draining tank will take to drain and run for the minimum time
double resourceDrainTime = double.MaxValue;
PartSim partMinDrain = null;
@@ -493,7 +523,6 @@
{
MonoBehaviour.print("Drain time = " + resourceDrainTime + " (" + partMinDrain.name + ":" + partMinDrain.partId + ")");
}
-
foreach (PartSim partSim in this.drainingParts)
{
partSim.DrainResources(resourceDrainTime);
@@ -525,7 +554,7 @@
// Recalculate the current thrust and isp for the next step
this.CalculateThrustAndISP();
-
+
// Check if we actually changed anything
if (this.stepStartMass == this.stepEndMass)
{
@@ -551,6 +580,7 @@
this.stepStartMass = this.stepEndMass;
}
+
// Store more values in the Stage object and stick it in the array
// Store the magnitude of the deltaV vector
@@ -606,8 +636,6 @@
// For each stage we total up the cost, mass, deltaV and time for this stage and all the stages above
for (int j = i; j >= 0; j--)
{
- stages[i].totalCost += stages[j].cost;
- stages[i].totalMass += stages[j].mass;
stages[i].totalDeltaV += stages[j].deltaV;
stages[i].totalTime += stages[j].time;
stages[i].partCount = i > 0 ? stages[i].totalPartCount - stages[i - 1].totalPartCount : stages[i].totalPartCount;
@@ -631,8 +659,66 @@
this._timer.Stop();
MonoBehaviour.print("RunSimulation: " + this._timer.ElapsedMilliseconds + "ms");
}
-
+ FreePooledObject();
+
return stages;
+ }
+
+ public double UpdatePartMasses()
+ {
+ for (int i = 0; i < this.allParts.Count; i++)
+ {
+ this.allParts[i].baseMass = this.allParts[i].realMass;
+ this.allParts[i].baseMassForCoM = this.allParts[i].realMass;
+ }
+
+ for (int i = 0; i < this.allParts.Count; i++)
+ {
+ PartSim part = this.allParts[i];
+ // If the part has a parent
+ if (part.parent != null)
+ {
+ if (part.isNoPhysics)
+ {
+ if (part.parent.isNoPhysics && part.parent.parent != null)
+ {
+ part.baseMass = 0d;
+ part.baseMassForCoM = 0d;
+ }
+ else
+ {
+ part.parent.baseMassForCoM += part.baseMassForCoM;
+ part.baseMassForCoM = 0d;
+ }
+ }
+ }
+ }
+
+ double totalMass = 0d;
+ for (int i = 0; i < this.allParts.Count; i++)
+ {
+ totalMass += this.allParts[i].startMass = this.allParts[i].GetMass(currentStage);
+ }
+
+ return totalMass;
+ }
+
+ // Make sure we free them all, even if they should all be free already at this point
+ public void FreePooledObject()
+ {
+ //MonoBehaviour.print("FreePooledObject pool size before = " + PartSim.pool.Count() + " for " + allParts.Count + " parts");
+ foreach (PartSim part in allParts)
+ {
+ part.Release();
+ }
+ //MonoBehaviour.print("FreePooledObject pool size after = " + PartSim.pool.Count());
+
+ //MonoBehaviour.print("FreePooledObject pool size before = " + EngineSim.pool.Count() + " for " + allEngines.Count + " engines");
+ foreach (EngineSim engine in allEngines)
+ {
+ engine.Release();
+ }
+ //MonoBehaviour.print("FreePooledObject pool size after = " + EngineSim.pool.Count());
}
private void BuildDontStageLists(LogMsg log)
@@ -663,7 +749,8 @@
{
if (log != null)
{
- log.buf.AppendLine(partSim.name + ":" + partSim.partId + " is engine or tank, decoupled = " + partSim.decoupledInStage);
+ log.buf.AppendLine(
+ partSim.name + ":" + partSim.partId + " is engine or tank, decoupled = " + partSim.decoupledInStage);
}
if (partSim.decoupledInStage < -1 || partSim.decoupledInStage > this.currentStage - 1)
@@ -696,7 +783,6 @@
for (int i = 0; i < allEngines.Count; ++i)
{
EngineSim engine = allEngines[i];
-
if (engine.isActive)
{
this.activeEngines.Add(engine);
@@ -734,9 +820,7 @@
this.totalStageThrustForce.AddForce(engine.appliedForces[j]);
}
}
-
//MonoBehaviour.print("vecThrust = " + vecThrust.ToString() + " magnitude = " + vecThrust.magnitude);
-
this.totalStageThrust = this.vecThrust.magnitude;
this.totalStageActualThrust = this.vecActualThrust.magnitude;
@@ -794,8 +878,9 @@
StringBuilder buffer = new StringBuilder(1024);
buffer.AppendFormat("Active engines = {0:d}\n", this.activeEngines.Count);
int i = 0;
- foreach (EngineSim engine in this.activeEngines)
- {
+ for (int j = 0; j < this.activeEngines.Count; j++)
+ {
+ EngineSim engine = this.activeEngines[j];
engine.DumpEngineToBuffer(buffer, "Engine " + (i++) + ":");
}
MonoBehaviour.print(buffer);
@@ -893,14 +978,17 @@
{
// Remove it from the all parts list
this.allParts.Remove(partSim);
+ partSim.Release();
if (partSim.isEngine)
{
// If it is an engine then loop through all the engine modules and remove all the ones from this engine part
for (int i = this.allEngines.Count - 1; i >= 0; i--)
{
- if (this.allEngines[i].partSim == partSim)
+ EngineSim engine = this.allEngines[i];
+ if (engine.partSim == partSim)
{
this.allEngines.RemoveAt(i);
+ engine.Release();
}
}
}
@@ -912,7 +1000,8 @@
}
// Loop through all the (remaining) parts
- for (int i = 0; i < allParts.Count; ++i) {
+ for (int i = 0; i < allParts.Count; ++i)
+ {
// Ask the part to remove all the parts that are decoupled
allParts[i].RemoveAttachedParts(decoupledParts);
}
@@ -954,3 +1043,4 @@
}
}
}
+
Binary files a/Output/KerbalEngineer/KerbalEngineer.dll and b/Output/KerbalEngineer/KerbalEngineer.dll differ
--- a/Output/KerbalEngineer/KerbalEngineer.version
+++ b/Output/KerbalEngineer/KerbalEngineer.version
@@ -5,13 +5,13 @@
{
"MAJOR":1,
"MINOR":0,
- "PATCH":16,
- "BUILD":3
+ "PATCH":17,
+ "BUILD":0
},
"KSP_VERSION":
{
"MAJOR":1,
"MINOR":0,
- "PATCH":0
+ "PATCH":4
}
}