Merge pull request #139 from Algoryx/feature/cable-instanced-renderin…

…g-update

Feature/cable instanced rendering update

AGXUnity/Utils/RenderingUtils.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using UnityEngine;
 using UnityEngine.Rendering;
 
@@ -32,6 +33,59 @@ public static PipelineType DetectPipeline()
       return PipelineType.BuiltIn;
     }
 
+    /// <summary>
+    /// Checks whether the material supports a given pipeline type. 
+    /// Some assumptions are made here. 
+    /// If we don't recognize the pipeline type we assume that the material does
+    /// not support the pipeline. Similarly we assume that all materials support
+    /// the built-in pipeline. This is done since it is not possible to easily tell
+    /// if a given material is supported and the chance of having a HDRP or URP material
+    /// being used is quite small since project conversions to the Built-in pipeline
+    /// is not supported by Unity.
+    /// 
+    /// This works by checking whether any subshader defines the RenderPipeline
+    /// tag and if so, compares the value to a set of supported identifiers:
+    /// For HDRP:
+    ///  - HDRenderPipeline
+    ///  - HighDefinitionRenderPipeline
+    /// For URP:
+    ///  - UniversalRenderPipeline
+    /// </summary>
+    /// <param name="pipelineType">The pipeline to check for support against</param>
+    /// <returns>true if the specified pipeline is supported, false otherwise</returns>
+    public static bool SupportsPipeline( this Material mat, PipelineType pipelineType )
+    {
+      if ( mat.shader.name == "Hidden/InternalErrorShader" )
+        return false;
+      if ( pipelineType == PipelineType.Unsupported )
+        return false;
+      if ( pipelineType == PipelineType.BuiltIn )
+        return true;
+
+      string[] supportedTags = new string[0];
+      if ( pipelineType == PipelineType.HDRP ) {
+        supportedTags = new string[]
+        {
+          "HDRenderPipeline",
+          "HighDefinitionRenderPipeline"
+        };
+      }
+      if ( pipelineType == PipelineType.Universal ) {
+        supportedTags = new string[] {
+          "UniversalRenderPipeline",
+          "UniversalPipeline"
+        };
+      }
+
+      for ( int i = 0; i < mat.shader.subshaderCount; i++ ) {
+        var tagName = mat.shader.FindSubshaderTagValue( i, new ShaderTagId( "RenderPipeline" ) ).name;
+        if ( supportedTags.Contains( tagName ) )
+          return true;
+      }
+
+      return false;
+    }
+
     /// <summary>
     /// Check if the given camera should render at this point in time.
     /// This should be used as an early-out in custom render callbacks to avoid rendering dynamic objects in
@@ -45,12 +99,13 @@ public static PipelineType DetectPipeline()
     public static bool CameraShouldRender( Camera cam, GameObject allowedPrefabObject = null, bool includeInPreview = false )
     {
       // Only render preview if specified in flag
-      if ( cam.cameraType == CameraType.Preview)
+      if ( cam.cameraType == CameraType.Preview )
         return includeInPreview;
 
       // Render all except SceneView which require additional checks for prefab stage
       if ( cam.cameraType != CameraType.SceneView )
-        return PrefabUtils.IsNonAssetInstance( allowedPrefabObject );
+        return ( !PrefabUtils.IsPrefabInstance( allowedPrefabObject ) && !PrefabUtils.IsPartOfEditingPrefab( allowedPrefabObject ) ) ||
+                PrefabUtils.IsNonAssetInstance( allowedPrefabObject );
 
       // Only render in prefab stage if allowed object is present in it.
       if ( PrefabUtils.IsEditingPrefab )

Editor/AGXUnityEditor/IO/InputAGXFile.cs

@@ -7,7 +7,6 @@
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
-using AGXUnity.Utils;
 using Node = AGXUnityEditor.IO.InputAGXFileTreeNode;
 using Tree = AGXUnityEditor.IO.InputAGXFileTree;