Merge pull request #855 from Unity-Technologies/LW-Resources

Split resources into editor and runtime resources

ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineAsset.cs

         [SerializeField] private Vector3 m_Cascade4Split = new Vector3(0.067f, 0.2f, 0.467f);
         
         [SerializeField]
-        private LightweightPipelineResource m_ResourceAsset;
+        private LightweightPipelineResources m_ResourcesAsset;
+
+        private LightweightPipelineEditorResources m_EditorResourcesAsset;
+
         [MenuItem("Assets/Create/Render Pipeline/Lightweight/Pipeline Asset", priority = CoreUtils.assetCreateMenuPriority1)]
         static void CreateLightweightPipeline()
         {
 
+
+        //[MenuItem("Assets/Create/Render Pipeline/Lightweight/Pipeline Resources", priority = CoreUtils.assetCreateMenuPriority1)]
+        static void CreateLightweightPipelineResources()
+        {
+            var instance = CreateInstance<LightweightPipelineResources>();
+            AssetDatabase.CreateAsset(instance, string.Format("Assets/{0}.asset", typeof(LightweightPipelineResources).Name));
+        }
+
+        //[MenuItem("Assets/Create/Render Pipeline/Lightweight/Pipeline Editor Resources", priority = CoreUtils.assetCreateMenuPriority1)]
+        static void CreateLightweightPipelineEditorResources()
+        {
+            var instance = CreateInstance<LightweightPipelineEditorResources>();
+            AssetDatabase.CreateAsset(instance, string.Format("Assets/{0}.asset", typeof(LightweightPipelineEditorResources).Name));
+        }
+
+
-                instance.LoadResourceFile();
+                instance.m_EditorResourcesAsset = LoadResourceFile<LightweightPipelineEditorResources>();
+                instance.m_ResourcesAsset = LoadResourceFile<LightweightPipelineResources>();
-        private void LoadResourceFile()
+        private static T LoadResourceFile<T>() where T : ScriptableObject
-            string[] guids = AssetDatabase.FindAssets("LightweightPipelineResource t:scriptableobject", m_SearchPaths);
-            LightweightPipelineResource resourceAsset = null;
+            T resourceAsset = null;
+            var guids = AssetDatabase.FindAssets(typeof(T).Name + " t:scriptableobject", m_SearchPaths);
-                m_ResourceAsset = AssetDatabase.LoadAssetAtPath<LightweightPipelineResource>(path);
-                if (m_ResourceAsset != null)
+                resourceAsset = AssetDatabase.LoadAssetAtPath<T>(path);
+                if (resourceAsset != null)
-            if (m_ResourceAsset == null)
+            if (resourceAsset == null)
+            {
+                string path = m_SearchPaths[PACKAGE_MANAGER_PATH_INDEX] + "/LWRP/Data/" + typeof(T).Name + ".asset";
+                resourceAsset = AssetDatabase.LoadAssetAtPath<T>(path);
+            }
+            return resourceAsset;
+        }
+
+        LightweightPipelineEditorResources editorResources
+        {
+            get
-                string path = m_SearchPaths[PACKAGE_MANAGER_PATH_INDEX] + "/LWRP/Data/LightweightPipelineResource.asset";
-                m_ResourceAsset = AssetDatabase.LoadAssetAtPath<LightweightPipelineResource>(path);
+                if (m_EditorResourcesAsset == null)
+                    m_EditorResourcesAsset = LoadResourceFile<LightweightPipelineEditorResources>();
+
+                return m_EditorResourcesAsset;
+        LightweightPipelineResources resources
+        {
+            get
+            {
+#if UNITY_EDITOR
+                if (m_ResourcesAsset == null)
+                    m_ResourcesAsset = LoadResourceFile<LightweightPipelineResources>();
+#endif
+                return m_ResourcesAsset;
+            }
+        }
 
         protected override IRenderPipeline InternalCreatePipeline()
         {
         private Material GetMaterial(DefaultMaterialType materialType)
         {
 #if UNITY_EDITOR
-            if (m_ResourceAsset == null)
-                LoadResourceFile();
-
+            
-                    return m_ResourceAsset.DefaultMaterial;
+                    return editorResources.DefaultMaterial;
-                    return m_ResourceAsset.DefaultParticleMaterial;
+                    return editorResources.DefaultParticleMaterial;
-                    return m_ResourceAsset.DefaultTerrainMaterial;
+                    return editorResources.DefaultTerrainMaterial;
 
                 // Unity Builtin Default
                 default:
 
         public Shader BlitShader
         {
-            get
-            {
-#if UNITY_EDITOR
-                if (m_ResourceAsset == null)
-                    LoadResourceFile();
-#endif
-                if (m_ResourceAsset)
-                    return m_ResourceAsset.BlitShader;
-                return null;
-            }
+            get { return resources != null ? resources.BlitShader : null; }
-            get
-            {
-#if UNITY_EDITOR
-                if (m_ResourceAsset == null)
-                    LoadResourceFile();
-#endif
-                if (m_ResourceAsset)
-                    return m_ResourceAsset.CopyDepthShader;
-                return null;
-            }
+            get { return resources != null ? resources.CopyDepthShader : null; }
         }
     }
 }

ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineEditorResources.cs.meta

 fileFormatVersion: 2
-guid: eb91b173ce266e040aa972ca9a561308
+guid: 76e49a5b88430df478c504fe5a5c1a62
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Tests/GraphicsTests/RenderPipeline/LightweightPipeline/LightweightPipelineAsset.asset

   m_ShadowCascades: 2
   m_Cascade2Split: 0.25
   m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
-  m_BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
-  m_CopyDepthShader: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
+  m_ResourcesAsset: {fileID: 11400000, guid: aac5a08c32552a14c89394b703f1978a, type: 2}

ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineEditorResources.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76e49a5b88430df478c504fe5a5c1a62, type: 3}
+  m_Name: LightweightPipelineEditorResources
+  m_EditorClassIdentifier: 
+  DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d,
+    type: 2}
+  DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e,
+    type: 2}

ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineEditorResources.asset.meta

+fileFormatVersion: 2
+guid: a3d8d823eedde654bb4c11a1cfaf1abb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineEditorResources.cs

+using System;
+using UnityEngine;
+
+public class LightweightPipelineEditorResources : ScriptableObject
+{
+    public Material DefaultMaterial;
+    public Material DefaultParticleMaterial;
+    public Material DefaultTerrainMaterial;
+}

ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineResources.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cc1f30932f41a6a4d8c53677788dd8aa, type: 3}
+  m_Name: LightweightPipelineResources
+  m_EditorClassIdentifier: 
+  BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
+  CopyDepthShader: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}

ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineResources.asset.meta

+fileFormatVersion: 2
+guid: aac5a08c32552a14c89394b703f1978a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineResources.cs

+using UnityEngine;
+
+public class LightweightPipelineResources : ScriptableObject
+{
+    public Shader BlitShader;
+    public Shader CopyDepthShader;
+}

ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineResources.cs.meta

+fileFormatVersion: 2
+guid: cc1f30932f41a6a4d8c53677788dd8aa
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineResource.asset.meta

-fileFormatVersion: 2
-guid: c8afc0a27fb8c0b4da18151c689a1082
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineResource.asset

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: eb91b173ce266e040aa972ca9a561308, type: 3}
-  m_Name: LightweightPipelineResource
-  m_EditorClassIdentifier: 
-  DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
-  DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d,
-    type: 2}
-  DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e,
-    type: 2}
-  BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
-  CopyDepthShader: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}

ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineResource.cs

-using UnityEngine;
-
-public class LightweightPipelineResource : ScriptableObject
-{
-    public Shader BlitShader;
-    public Shader CopyDepthShader;
-#if UNITY_EDITOR
-    public Material DefaultMaterial;
-    public Material DefaultParticleMaterial;
-    public Material DefaultTerrainMaterial;
-#endif
-}