Reference DragCubeTool from ROUtils and implement caching (#359)

Author: siimav

Source/ProceduralAbstractShape.cs

@@ -151,6 +151,11 @@ protected set
         }
         private float _length;
 
+        /// <summary>
+        /// Key that will uniquely identify the geometry of the current shape.
+        /// </summary>
+        public abstract string ShapeKey { get; }
+
         #endregion
 
         #region Events

Source/ProceduralPart.cs

@@ -5,6 +5,7 @@
 using KSPAPIExtensions;
 using System.Reflection;
 using UnityEngine.Profiling;
+using ROUtils;
 
 namespace ProceduralParts
 {
@@ -596,13 +597,7 @@ public void OnPartColliderChanged()
         {
             if (!HighLogic.LoadedSceneIsEditor || updateDragCubesInEditor)
             {
-                // Drag cubes should get generated immediately during the partcatalog compilation stage;
-                // in all other cases there may need to be a delay.
-                if (PartLoader.Instance.IsReady())
-                    ProceduralTools.DragCubeTool.UpdateDragCubes(part);
-                else
-                    ProceduralTools.DragCubeTool.UpdateDragCubesImmediate(part);
-                
+                DragCubeTool.UpdateDragCubes(part, CurrentShape.ShapeKey);
             }
         }
 

Source/ProceduralParts.csproj

@@ -65,6 +65,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ROUtils">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System">
       <Private>False</Private>
     </Reference>
@@ -111,7 +114,6 @@
     <Compile Include="ProceduralAbstractShape.cs" />
     <Compile Include="ProceduralPart.cs" />
     <Compile Include="ProceduralAbstractSoRShape.cs" />
-    <Compile Include="ProceduralTools\DragCubeTool.cs" />
     <Compile Include="ProceduralTools\KSPFieldTool.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TankContentSwitcher.cs" />

Source/ProceduralShapeBezierCone.cs

@@ -66,6 +66,15 @@ internal class ShapePreset
 
         #endregion
 
+        public override string ShapeKey
+        {
+            get
+            {
+                string shape = selectedShape != CustomShapeName ? selectedShape : $"{shapePoints.x};{shapePoints.y};{shapePoints.z};{shapePoints.w}";
+                return $"BCone|{topDiameter}|{bottomDiameter}|{length}|{offset}|{shape}";
+            }
+        }
+
         #region Helper Funcs
 
         internal const float MaxCircleError = 0.01f;

Source/ProceduralShapeCone.cs

@@ -25,6 +25,8 @@ public class ProceduralShapeCone : ProceduralAbstractSoRShape
 
         #endregion
 
+        public override string ShapeKey => $"PP-Cone|{topDiameter}|{bottomDiameter}|{length}";
+
         #region Limit paramters
 
         /// <summary>

Source/ProceduralShapeCylinder.cs

@@ -18,6 +18,8 @@ public class ProceduralShapeCylinder : ProceduralAbstractSoRShape
 
         #endregion
 
+        public override string ShapeKey => $"PP-Cyl|{diameter}|{length}";
+
         #region Initialization
 
         public override void OnStart(StartState state)

Source/ProceduralShapeHollowCone.cs

@@ -9,7 +9,7 @@ namespace ProceduralParts
     class ProceduralShapeHollowCone : ProceduralAbstractShape
     {
         private const string ModTag = "[ProceduralShapeHollowCone]";
-        public override Vector3 CoMOffset => CoMOffset_internal();
+        private const float maxError = 0.0125f;
 
         #region Config parameters
 
@@ -39,8 +39,6 @@ class ProceduralShapeHollowCone : ProceduralAbstractShape
             UI_FloatEdit(scene = UI_Scene.Editor, incrementSlide = SliderPrecision, sigFigs = 5, unit = "m", useSI = true)]
         public float length = 1f;
 
-        private const float maxError = 0.0125f;
-
         public int numSides => (int)Math.Max(Mathf.PI * Mathf.Sqrt(Mathf.Sqrt((Math.Max(bottomOuterDiameter, topOuterDiameter)))/(2f * maxError)), 24);
 
         [KSPField]
@@ -53,6 +51,9 @@ class ProceduralShapeHollowCone : ProceduralAbstractShape
 
         #region Utility Properties
 
+        public override Vector3 CoMOffset => CoMOffset_internal();
+        public override string ShapeKey => $"PP-HCone|{topOuterDiameter}|{topInnerDiameter}|{bottomOuterDiameter}|{bottomInnerDiameter}|{length}";
+
         private float CornerCenterCornerAngle => 2 * Mathf.PI / numSides;
         private float NormSideLength => Mathf.Tan(CornerCenterCornerAngle / 2);
 

Source/ProceduralShapeHollowCylinder.cs

@@ -9,6 +9,7 @@ namespace ProceduralParts
     class ProceduralShapeHollowCylinder : ProceduralAbstractShape
     {
         private const string ModTag = "[ProceduralShapeHollowCylinder]";
+        private const float maxError = 0.0125f;
 
         #region Config parameters
 
@@ -27,8 +28,6 @@ class ProceduralShapeHollowCylinder : ProceduralAbstractShape
             UI_FloatEdit(scene = UI_Scene.Editor, incrementSlide = SliderPrecision, sigFigs = 5, unit = "m", useSI = true)]
         public float length = 1f;
 
-        private const float maxError = 0.0125f;
-
         public int numSides => (int)Math.Max(Mathf.PI * Mathf.Sqrt(Mathf.Sqrt(outerDiameter)/(2f * maxError)), 24);
 
         [KSPField]
@@ -41,6 +40,8 @@ class ProceduralShapeHollowCylinder : ProceduralAbstractShape
 
         #region Utility Properties
 
+        public override string ShapeKey => $"PP-HCyl|{outerDiameter}|{innerDiameter}|{length}";
+
         private float CornerCenterCornerAngle => 2 * Mathf.PI / numSides;
         private float NormSideLength => Mathf.Tan(CornerCenterCornerAngle / 2);
 

Source/ProceduralShapeHollowPill.cs

@@ -12,6 +12,7 @@ namespace ProceduralParts
     class ProceduralShapeHollowPill : ProceduralAbstractShape
     {
         private const string ModTag = "[ProceduralShapeHollowPill]";
+        private const float maxError = 0.0125f;
 
         [KSPField(guiActiveEditor = true, guiName = "Diameters", groupName = ProceduralPart.PAWGroupName)]
         private string diamTitleString = "";
@@ -32,8 +33,6 @@ class ProceduralShapeHollowPill : ProceduralAbstractShape
             UI_FloatEdit(scene = UI_Scene.Editor, incrementSlide = SliderPrecision, sigFigs = 5, unit="m", useSI = true)]
         public float fillet = 0f;
 
-        private const float maxError = 0.0125f;
-
         public int numSides => (int)Math.Max(Mathf.PI * Mathf.Sqrt(Mathf.Sqrt(outerDiameter)/(2f * maxError)), 24);
 
         public float MajorRadius => (outerDiameter + innerDiameter) / 4;
@@ -48,6 +47,8 @@ class ProceduralShapeHollowPill : ProceduralAbstractShape
         private float CornerCenterCornerAngle => 2 * Mathf.PI / numSides;
         private float NormSideLength => Mathf.Tan(CornerCenterCornerAngle / 2);
 
+        public override string ShapeKey => $"PP-HPill|{innerDiameter}|{outerDiameter}|{length}|{fillet}";
+
         public override void OnStart(StartState state)
         {
             base.OnStart(state);

Source/ProceduralShapeHollowTruss.cs

@@ -9,6 +9,7 @@ class ProceduralShapeHollowTruss : ProceduralAbstractShape
     {
         #region KSPFields
         private const string ModTag = "[ProceduralShapeHollowTruss]";
+        private const float maxMeshBendError = 0.02f;
 
         [KSPField(isPersistant = true, guiActiveEditor = true, guiName = "Top D", guiFormat = "F3", guiUnits = "m", groupName = ProceduralPart.PAWGroupName),
             UI_FloatEdit(scene = UI_Scene.Editor, incrementSlide = SliderPrecision, sigFigs = 5, unit = "m", useSI = true)]
@@ -61,10 +62,10 @@ public float RealLength
                 return realLength;
             }
         }
-
-        const float maxMeshBendError = 0.02f;
         #endregion
 
+        public override string ShapeKey => $"PP-HTruss|N{nbRods}{(symmetryRods ? "S" : "")}|{topDiameter}|{bottomDiameter}|{length}|{rodDiameter}|{tiltAngle}|{offsetAngle}";
+
         public override void OnStart(StartState state)
         {
             base.OnStart(state);