Add properties for shape stats to Abstract Shape. Support adding mass…

… for hollow volume
KSP-RO · Sep 29, 2023 · 527b277 · 527b277
1 parent 12755a4
commit 527b277
Show file tree

Hide file tree

Showing 12 changed files with 137 additions and 10 deletions.
diff --git a/Source/ProceduralAbstractShape.cs b/Source/ProceduralAbstractShape.cs
@@ -91,6 +91,66 @@ protected set
         }
         private float _volume;
 
+        public float NominalVolume
+        {
+            get => _nominalVolume;
+            protected set
+            {
+                _nominalVolume = value;
+            }
+        }
+        private float _nominalVolume;
+
+        public float MaxDiameter
+        {
+            get => _maxDiameter;
+            protected set
+            {
+                _maxDiameter = value;
+            }
+        }
+        private float _maxDiameter;
+
+        public float MinDiameter
+        {
+            get => _minDiameter;
+            protected set
+            {
+                _minDiameter = value;
+            }
+        }
+        private float _minDiameter;
+
+        public float InnerMinDiameter
+        {
+            get => _innerMinDiameter;
+            protected set
+            {
+                _innerMinDiameter = value;
+            }
+        }
+        private float _innerMinDiameter;
+
+        public float InnerMaxDiameter
+        {
+            get => _innerMaxDiameter;
+            protected set
+            {
+                _innerMaxDiameter = value;
+            }
+        }
+        private float _innerMaxDiameter;
+
+        public float Length
+        {
+            get => _length;
+            protected set
+            {
+                _length = value;
+            }
+        }
+        private float _length;
+
         #endregion
 
         #region Events
@@ -279,6 +339,7 @@ public void ChangeVolume(string volName, double newVolume)
             var data = new BaseEventDetails (BaseEventDetails.Sender.USER);
             data.Set<string> ("volName", volName);
             data.Set<double> ("newTotalVolume", newVolume);
+            data.Set<double> ("newNominalVolume", NominalVolume);
             Debug.Log($"{ModTag} {part.name} OnPartVolumeChanged volName:{volName} vol:{newVolume:F4}");
             part.SendEvent ("OnPartVolumeChanged", data, 0);
         }

diff --git a/Source/ProceduralPart.cs b/Source/ProceduralPart.cs
@@ -8,7 +8,7 @@
 
 namespace ProceduralParts
 {
-    public class ProceduralPart : PartModule, IPartCostModifier
+    public class ProceduralPart : PartModule, IPartCostModifier, IPartMassModifier
     {
         public static readonly string ModTag = "[ProceduralParts]";
         public const string PAWGroupName = "ProcParts";
@@ -594,6 +594,28 @@ public void UpdateProps()
                 prop.UpdateProp();
         }
 
+        #region Mass override for hollow tanks
+
+        [KSPField]
+        public float densityForHollowVolume = 0f;
+
+        [KSPField(isPersistant = true)]
+        public float moduleMass = 0f;
+
+        public ModifierChangeWhen GetModuleMassChangeWhen() => ModifierChangeWhen.FIXED;
+
+        public float GetModuleMass(float defaultMass, ModifierStagingSituation sit)
+        {
+            if (shape == null || !HighLogic.LoadedSceneIsEditor)
+                return moduleMass;
+
+            moduleMass = shape.NominalVolume < shape.Volume ? 0f : densityForHollowVolume * (shape.NominalVolume - shape.Volume);
+
+            return moduleMass;
+        }
+
+        #endregion
+
         #region TestFlight
         public static Type tfInterface = null;
         public static BindingFlags tfBindingFlags = BindingFlags.InvokeMethod | BindingFlags.Public | BindingFlags.Static;

diff --git a/Source/ProceduralShapeBezierCone.cs b/Source/ProceduralShapeBezierCone.cs
@@ -307,7 +307,12 @@ private void SetFieldVisibility()
         internal override void UpdateShape(bool force = true)
         {
             Profiler.BeginSample("UpdateShape BCone");
-            Volume = CalculateVolume();
+            MaxDiameter = Mathf.Max(topDiameter, bottomDiameter);
+            MinDiameter = Mathf.Min(topDiameter, bottomDiameter);
+            InnerMaxDiameter = InnerMinDiameter = -1f;
+            Length = length;
+            NominalVolume = CalculateVolume();
+            Volume = NominalVolume;
             SetControlPoints(length, topDiameter, bottomDiameter);
             // Ensure correct control points if something called AdjustDimensionBounds or CalculateVolume when handling volume change event
             WriteBezier();

diff --git a/Source/ProceduralShapeCone.cs b/Source/ProceduralShapeCone.cs
@@ -146,7 +146,12 @@ internal override void UpdateShape(bool force = true)
         {
             Profiler.BeginSample("UpdateShape Cone");
             part.CoMOffset = CoMOffset;
-            Volume = CalculateVolume();
+            MaxDiameter = Mathf.Max(topDiameter, bottomDiameter);
+            MinDiameter = Mathf.Min(topDiameter, bottomDiameter);
+            InnerMaxDiameter = InnerMinDiameter = -1f;
+            Length = length;
+            NominalVolume = CalculateVolume();
+            Volume = NominalVolume;
             Vector2 norm = new Vector2(length, (bottomDiameter - topDiameter) / 2f);
             norm.Normalize();
 
@@ -249,7 +254,7 @@ public override void AdjustDimensionBounds()
         }
 
         public override float CalculateVolume() => CalculateVolume(length, topDiameter, bottomDiameter);
-        public virtual float CalculateVolume(float length, float topDiameter, float bottomDiameter)
+        public static float CalculateVolume(float length, float topDiameter, float bottomDiameter)
         {
             return (Mathf.PI * length * (topDiameter * topDiameter + topDiameter * bottomDiameter + bottomDiameter * bottomDiameter)) / 12f;
         }

diff --git a/Source/ProceduralShapeCylinder.cs b/Source/ProceduralShapeCylinder.cs
@@ -56,7 +56,11 @@ internal override void UpdateShape(bool force = true)
         {
             Profiler.BeginSample("UpdateShape Cyl");
             part.CoMOffset = CoMOffset;
-            Volume = CalculateVolume();
+            MaxDiameter = MinDiameter = diameter;
+            InnerMaxDiameter = InnerMinDiameter = -1f;
+            Length = length;
+            NominalVolume = CalculateVolume();
+            Volume = NominalVolume;
             Vector2 norm = new Vector2(1, 0);
 
             WriteMeshes(
@@ -92,7 +96,7 @@ public override void AdjustDimensionBounds()
         }
 
         public override float CalculateVolume() => CalculateVolume(length, diameter);
-        public float CalculateVolume(float length, float diameter)
+        public static float CalculateVolume(float length, float diameter)
         {
             return diameter * diameter * 0.25f * Mathf.PI * length;
         }

diff --git a/Source/ProceduralShapeHollowCone.cs b/Source/ProceduralShapeHollowCone.cs
@@ -241,6 +241,12 @@ internal override void UpdateShape(bool force = true)
         {
             Profiler.BeginSample("UpdateShape HCone");
             part.CoMOffset = CoMOffset;
+            MaxDiameter = Mathf.Max(topOuterDiameter, bottomOuterDiameter);
+            MinDiameter = Mathf.Min(topOuterDiameter, bottomOuterDiameter);
+            InnerMaxDiameter = Mathf.Max(topInnerDiameter, bottomInnerDiameter);
+            InnerMinDiameter = Mathf.Min(topInnerDiameter, bottomInnerDiameter);
+            Length = length;
+            NominalVolume = ProceduralShapeCone.CalculateVolume(length, topOuterDiameter, bottomOuterDiameter);
             Volume = CalculateVolume();
             GenerateMeshes(bottomOuterDiameter / 2, bottomInnerDiameter / 2, topOuterDiameter / 2, topInnerDiameter / 2, length, numSides);
 

diff --git a/Source/ProceduralShapeHollowCylinder.cs b/Source/ProceduralShapeHollowCylinder.cs
@@ -151,6 +151,10 @@ internal override void UpdateShape(bool force = true)
         {
             Profiler.BeginSample("UpdateShape HCyl");
             part.CoMOffset = CoMOffset;
+            MinDiameter = MaxDiameter = outerDiameter;
+            InnerMinDiameter = InnerMaxDiameter = innerDiameter;
+            Length = length;
+            NominalVolume = ProceduralShapeCylinder.CalculateVolume(length, outerDiameter);
             Volume = CalculateVolume();
             GenerateMeshes(outerDiameter / 2, innerDiameter / 2, length, numSides);
 

diff --git a/Source/ProceduralShapeHollowPill.cs b/Source/ProceduralShapeHollowPill.cs
@@ -196,6 +196,12 @@ internal override void UpdateShape(bool force = true)
         {
             Profiler.BeginSample("UpdateShape HPill");
             part.CoMOffset = CoMOffset;
+            MaxDiameter = outerDiameter;
+            MinDiameter = outerDiameter - fillet * 2f;
+            InnerMaxDiameter = innerDiameter;
+            InnerMinDiameter = innerDiameter - fillet * 2f;
+            Length = length;
+            NominalVolume = ProceduralShapePill.CalculateVolume(length, outerDiameter, fillet);
             Volume = CalculateVolume();
             GenerateMeshes(MajorRadius, MinorRadius, length, fillet / 2, (int)numSides);
 

diff --git a/Source/ProceduralShapeHollowTruss.cs b/Source/ProceduralShapeHollowTruss.cs
@@ -213,6 +213,12 @@ internal override void UpdateShape(bool force = true)
         {
             Profiler.BeginSample("UpdateShape Truss");
             part.CoMOffset = CoMOffset;
+            MaxDiameter = Mathf.Max(bottomDiameter, topDiameter);
+            MinDiameter = Mathf.Min(bottomDiameter, topDiameter);
+            InnerMaxDiameter = MaxDiameter - rodDiameter * 2f;
+            InnerMinDiameter = MinDiameter - rodDiameter * 2f;
+            Length = length;
+            NominalVolume = ProceduralShapeCone.CalculateVolume(length, topDiameter, bottomDiameter);
             Volume = CalculateVolume();
             GenerateMeshes(bottomDiameter / 2, topDiameter / 2, length, rodDiameter / 2, (int)nbRods, tiltAngle * Mathf.Deg2Rad, offsetAngle * Mathf.Deg2Rad, symmetryRods);
 

diff --git a/Source/ProceduralShapePill.cs b/Source/ProceduralShapePill.cs
@@ -161,7 +161,11 @@ internal override void UpdateShape(bool forceUpdate=true)
         {
             Profiler.BeginSample("UpdateShape Pill");
             part.CoMOffset = CoMOffset;
-            Volume = CalculateVolume();
+            MinDiameter = MaxDiameter = diameter;
+            InnerMinDiameter = InnerMaxDiameter = -1f;
+            Length = length;
+            NominalVolume = CalculateVolume();
+            Volume = NominalVolume;
             LinkedList<ProfilePoint> points = new LinkedList<ProfilePoint>();
 
             if (fillet == 0)
@@ -210,7 +214,7 @@ internal override void UpdateShape(bool forceUpdate=true)
         }
 
         public override float CalculateVolume() => CalculateVolume(length, diameter, fillet);
-        public virtual float CalculateVolume(float length, float diameter, float fillet)
+        public static float CalculateVolume(float length, float diameter, float fillet)
         {
             // To get formula for part volume: l = length, d = diameter, f = fillet
             // body cylinder = pi * r^2 * h 

diff --git a/Source/ProceduralShapePolygon.cs b/Source/ProceduralShapePolygon.cs
@@ -74,7 +74,7 @@ internal SimPart() { }
             //      => (0.25 * innerDIameter * innerDiameter * normSideLength * cornerCount)
         }
 
-        private float Length => length;
+        private new float Length => length;
         private int CornerCount => (int)cornerCount;
         private float CornerCenterCornerAngle => 2 * Mathf.PI / CornerCount;
         private float EdgeToEdgeAngle => Mathf.PI - CornerCenterCornerAngle;
@@ -147,6 +147,10 @@ internal override void UpdateShape(bool force = true)
         {
             Profiler.BeginSample("UpdateShape Polygon");
             part.CoMOffset = CoMOffset;
+            MinDiameter = MaxDiameter = diameter;
+            InnerMinDiameter = InnerMaxDiameter = -1f;
+            base.Length = length;
+            NominalVolume = ProceduralShapeCylinder.CalculateVolume(length, diameter);
             Volume = CalculateVolume();
             OuterDiameter = InnerDiameter / OuterToInnerFactor;
             GenerateMeshes();

diff --git a/Source/TankContentSwitcher.cs b/Source/TankContentSwitcher.cs
@@ -342,7 +342,7 @@ private double CalculateMaxResourceAmount(TankResource res)
 
         #endregion
 
-        public ProceduralPart PPart => _pPart ?? (_pPart = GetComponent<ProceduralPart>());
+        public ProceduralPart PPart => _pPart != null ? _pPart : (_pPart = GetComponent<ProceduralPart>());
         private ProceduralPart _pPart;
     }
 }