Merge pull request #135 from Algoryx/feature/cable-instanced-rendering

Feature/cable instanced rendering
Algoryx · Nov 16, 2023 · 3437f84 · 3437f84
2 parents 893d38c + e9d49b6
commit 3437f84
Show file tree

Hide file tree

Showing 15 changed files with 844 additions and 121 deletions.
diff --git a/AGXUnity/Cable.cs b/AGXUnity/Cable.cs
@@ -214,7 +214,7 @@ public CableRoute Route
     }
 
     private PointCurve m_routePointCurve              = null;
-    private float m_routePointResulutionPerUnitLength = -1.0f;
+    private float m_routePointResolutionPerUnitLength = -1.0f;
     private Vector3[] m_routePointsCache              = new Vector3[] { };
 
     /// <summary>
@@ -269,7 +269,7 @@ public bool RoutePointCurveUpToDate
       get
       {
         return m_routePointCurve != null &&
-               Utils.Math.Approximately( m_routePointResulutionPerUnitLength, ResolutionPerUnitLength ) &&
+               Utils.Math.Approximately( m_routePointResolutionPerUnitLength, ResolutionPerUnitLength ) &&
                Route.IsSynchronized( m_routePointCurve, 1.0E-4f );
       }
     }
@@ -542,7 +542,7 @@ public PointCurve.SegmentationResult SynchronizeRoutePointCurve()
         var numSegments = Mathf.Max( Mathf.CeilToInt( ResolutionPerUnitLength * Route.TotalLength ), 1 );
         var result = m_routePointCurve.FindSegmentLength( numSegments, PointCurve.DefaultErrorFunc, 5.0E-3f, 1.0E-3f );
         if ( result.Successful ) {
-          m_routePointResulutionPerUnitLength = ResolutionPerUnitLength;
+          m_routePointResolutionPerUnitLength = ResolutionPerUnitLength;
           var routePoints = new List<Vector3>();
           m_routePointCurve.Traverse( ( curr, next, type ) =>
           {

diff --git a/AGXUnity/CableDamage.cs b/AGXUnity/CableDamage.cs
@@ -48,7 +48,7 @@ public bool RenderCableDamage {
         if (CableRenderer == null)
           Debug.LogWarning("No CableRenderer to use for rendering cable damages");
         else
-          CableRenderer.SetRenderDamages(value);
+          CableRenderer.SetRenderDamages(value && m_properties != null);
       }
     }
 
@@ -71,6 +71,11 @@ public CableDamageProperties Properties
 
         if ( Native != null && m_properties != null )
           m_properties.Register( this );
+
+        if (CableRenderer == null)
+          Debug.LogWarning("No CableRenderer to use for rendering cable damages");
+        else
+          CableRenderer.SetRenderDamages(m_properties != null && m_renderCableDamage);
       }
     }
 
@@ -121,7 +126,7 @@ void Update()
 
       if (m_properties == null)
       {
-        Debug.LogError("No CableDamageProperties set!");
+        Debug.LogWarning("No CableDamageProperties set - no Cable Damage Calculated!");
         return;
       }