Merge pull request #200 from tier4/fix/wrap-rglobject-into-try-catch

Wrap RGLObject into try-catch to avoid processing the same objects endlessly
tier4 · Sep 21, 2023 · 3b4a144 · 3b4a144
2 parents 2725ece + 1820cef
commit 3b4a144
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 25 deletions.
diff --git a/Assets/RGLUnityPlugin/Scripts/LowLevelWrappers/RGLMeshObject.cs b/Assets/RGLUnityPlugin/Scripts/LowLevelWrappers/RGLMeshObject.cs
@@ -21,6 +21,44 @@
 
 namespace RGLUnityPlugin
 {
+    public static class RGLObjectHelper
+    {
+        internal static bool TryCreateRGLObject<T>(T meshSource, out IRGLObject rglObject) where T : UnityEngine.Object
+        {
+            try
+            {
+                if (meshSource is MeshRenderer mr)
+                {
+                    rglObject = new RGLMeshRendererObject(mr);
+                }
+                else if (meshSource is SkinnedMeshRenderer smr)
+                {
+                    rglObject = new RGLSkinnedMeshRendererObject(smr);
+                }
+                else if (meshSource is Collider collider)
+                {
+                    rglObject = new RGLColliderObject(collider);
+                }
+                else if (meshSource is Terrain terrain)
+                {
+                    rglObject = new RGLTerrainObject(terrain);
+                }
+                else
+                {
+                    Debug.LogError($"Could not create RGLObject from type '{typeof(T)}'");
+                    rglObject = null;
+                    return false;
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.LogWarning($"Cannot create RGLObject from '{meshSource.name}': {e.Message}. Skipping...");
+                rglObject = null;
+                return false;
+            }
+            return true;
+        }
+    }
 
     internal interface IRGLObject
     {
@@ -60,10 +98,6 @@ protected RGLObject(string identifier, GameObject representedGO, T meshSource)
             this.identifier = identifier;
             RepresentedGO = representedGO;
             rglMesh = GetRGLMeshFrom(meshSource);
-            if (rglMesh == null)
-            {
-                throw new RGLException($"Could not create RGLMesh from gameobject '{representedGO.name}'.");
-            }
             UploadToRGL();
             SetIntensityTexture();
 
@@ -189,7 +223,7 @@ private void SetIntensityTexture()
             }
             catch (RGLException)
             {
-                Debug.LogError($"Cannot assign texture: {rglTexture.Texture.name}, to entity: {RepresentedGO.name}");
+                Debug.LogError($"Cannot assign texture: '{rglTexture.Texture.name}', to entity: '{RepresentedGO.name}'");
                 throw;
             }
 
@@ -219,12 +253,14 @@ public RGLMeshRendererObject(MeshRenderer meshRenderer, Func<Matrix4x4> override
         protected override RGLMesh GetRGLMeshFrom(MeshRenderer meshRenderer)
         {
             var meshFilter = meshRenderer.GetComponent<MeshFilter>();
+            if (meshFilter == null)
+            {
+                throw new NotSupportedException($"Mesh renderer '{meshRenderer.gameObject.name}' has no MeshFilter component");
+            }
             if (meshFilter.sharedMesh == null)
             {
-                Debug.LogWarning($"Shared mesh of {meshRenderer.gameObject.name} is null, skipping");
-                return null;
+                throw new NotSupportedException($"Shared mesh of '{meshRenderer.gameObject.name}' is null");
             }
-
             return RGLMeshSharingManager.RegisterRGLMeshInstance(meshFilter.sharedMesh);
         }
 
@@ -255,6 +291,10 @@ public RGLSkinnedMeshRendererObject(SkinnedMeshRenderer skinnedMeshRenderer) :
 
         protected override RGLMesh GetRGLMeshFrom(SkinnedMeshRenderer skinnedMeshRenderer)
         {
+            if (skinnedMeshRenderer.sharedMesh == null)
+            {
+                throw new NotSupportedException($"Shared skinned mesh of '{skinnedMeshRenderer.gameObject}' is null");
+            }
             // Skinned meshes cannot be shared by using RGLMeshSharingManager
             return new RGLSkinnedMesh(skinnedMeshRenderer.gameObject.GetInstanceID(), skinnedMeshRenderer);
         }

diff --git a/Assets/RGLUnityPlugin/Scripts/SceneManager.cs b/Assets/RGLUnityPlugin/Scripts/SceneManager.cs
@@ -268,7 +268,10 @@ private static IEnumerable<IRGLObject> IntoRGLObjectsUsingColliders(IEnumerable<
                         continue;
                     }
 
-                    yield return new RGLColliderObject(collider);
+                    if (RGLObjectHelper.TryCreateRGLObject(collider, out IRGLObject rglObject))
+                    {
+                        yield return rglObject;
+                    }
                 }
             }
         }
@@ -299,13 +302,19 @@ private static IEnumerable<IRGLObject> IntoRGLObjectsHybrid(IEnumerable<GameObje
 
                 if (renderer is MeshRenderer mr)
                 {
-                    yield return new RGLMeshRendererObject(mr);
+                    if (RGLObjectHelper.TryCreateRGLObject(renderer, out IRGLObject rglObject))
+                    {
+                        yield return rglObject;
+                    }
                 }
             }
 
             foreach (var collider in collidersToYield)
             {
-                yield return new RGLColliderObject(collider);
+                if (RGLObjectHelper.TryCreateRGLObject(collider, out IRGLObject rglObject))
+                {
+                    yield return rglObject;
+                }
             }
         }
 
@@ -318,20 +327,9 @@ private static IEnumerable<IRGLObject> IntoRGLObjectsUsingMeshes(IEnumerable<Gam
         {
             foreach (var renderer in GetUniqueRenderersInGameObjects(gameObjects))
             {
-                if (renderer is MeshRenderer mr)
+                if (RGLObjectHelper.TryCreateRGLObject(renderer, out IRGLObject rglObject))
                 {
-                    yield return new RGLMeshRendererObject(mr);
-                }
-
-                if (renderer is SkinnedMeshRenderer smr)
-                {
-                    if (smr.sharedMesh == null)
-                    {
-                        Debug.LogWarning($"Shared mesh of {smr.gameObject} is null, skipping");
-                        continue;
-                    }
-
-                    yield return new RGLSkinnedMeshRendererObject(smr);
+                    yield return rglObject;
                 }
             }
         }
@@ -342,7 +340,10 @@ private static IEnumerable<IRGLObject> IntoRGLTerrainObjects(IEnumerable<GameObj
             {
                 if (gameObject.TryGetComponent<Terrain>(out var terrain))
                 {
-                    yield return new RGLTerrainObject(terrain);
+                    if (RGLObjectHelper.TryCreateRGLObject(terrain, out IRGLObject rglObject))
+                    {
+                        yield return rglObject;
+                    }
                 }
             }
         }