Use the AssetDatabase.FindAsset to find VFXResources asset (#48)

iTris666 · GitHub Enterprise · commit 9709d6d0d1a4 · 2020-07-30T12:37:28.000+02:00
* Use the AssetDatabase.FindAsset to find VFXResources asset

* Update CHANGELOG.md

* Search VFXResource only if necessary.

* LoadUserResourcesIfNeeded

* Fix changelog merge
diff --git a/com.unity.visualeffectgraph/CHANGELOG.md b/com.unity.visualeffectgraph/CHANGELOG.md
@@ -130,6 +130,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Make VisualEffect created from the GameObject menu have unique names [Case 1262989](https://issuetracker.unity3d.com/product/unity/issues/guid/1262989/)
 - Missing System Seed in new dynamic built-in operator.
 - Prefab highlight missing for initial event name toggle [Case 1263012](https://issuetracker.unity3d.com/product/unity/issues/guid/1263012/)
+- fixes the user created vfx default resources that were ignored unless loaded
 - fix crash when creating a loop in subgraph operators [Case 1251523](https://issuetracker.unity3d.com/product/unity/issues/guid/1251523/)
 
 ## [7.1.1] - 2019-09-05
diff --git a/com.unity.visualeffectgraph/Editor/Utils/VFXResources.cs b/com.unity.visualeffectgraph/Editor/Utils/VFXResources.cs
@@ -19,14 +19,34 @@ public static Values defaultResources
                 return s_Values;
             }
         }
+        private static bool m_Searched; // the instance has been searched and it is null
         private static VFXResources s_Instance;
         private static Values s_Values;
 
+        static void LoadUserResourcesIfNeeded()
+        {
+            if (s_Instance == null && (!m_Searched || !object.ReferenceEquals(s_Instance,null)))
+            // if instance is null and either it has never been searched or it was found but it has been destroyed since last time
+            {
+                foreach (var guid in AssetDatabase.FindAssets("t:VFXResources"))
+                {
+                    s_Instance = AssetDatabase.LoadAssetAtPath<VFXResources>(AssetDatabase.GUIDToAssetPath(guid));
+                    if (s_Instance != null)
+                    {
+                        return;
+                    }
+                }
+                s_Instance = null;
+                m_Searched = true;
+            }
+        }
+
         void OnEnable()
         {
-            if (Resources.FindObjectsOfTypeAll<VFXResources>().Length > 1)
+            if (AssetDatabase.FindAssets("t:VFXResources").Length > 1)
                 Debug.LogError("Having more than on VFXResources in you project is unsupported");
             s_Instance = this;
+            m_Searched = false;
         }
 
         public class Values
@@ -35,8 +55,7 @@ public AnimationCurve animationCurve
             {
                 get
                 {
-                    if (s_Instance == null)
-                        s_Instance = FindObjectOfType<VFXResources>();
+                    LoadUserResourcesIfNeeded();
                     if (s_Instance != null)
                         return s_Instance.animationCurve;
 
@@ -47,8 +66,7 @@ public Gradient gradient
             {
                 get
                 {
-                    if (s_Instance == null)
-                        s_Instance = FindObjectOfType<VFXResources>();
+                    LoadUserResourcesIfNeeded();
                     if (s_Instance != null)
                         return s_Instance.gradient;
                     return defaultGradient;
@@ -58,8 +76,7 @@ public Gradient gradientMapRamp
             {
                 get
                 {
-                    if (s_Instance == null)
-                        s_Instance = FindObjectOfType<VFXResources>();
+                    LoadUserResourcesIfNeeded();
                     if (s_Instance != null)
                         return s_Instance.gradientMapRamp;
                     return defaultGradientMapRamp;
@@ -70,8 +87,7 @@ public Shader shader
             {
                 get
                 {
-                    if (s_Instance == null)
-                        s_Instance = FindObjectOfType<VFXResources>();
+                    LoadUserResourcesIfNeeded();
                     if (s_Instance != null && s_Instance.shader != null)
                         return s_Instance.shader;
 
@@ -84,8 +100,7 @@ public Texture2D particleTexture
             {
                 get
                 {
-                    if (s_Instance == null)
-                        s_Instance = FindObjectOfType<VFXResources>();
+                    LoadUserResourcesIfNeeded();
                     if (s_Instance != null && s_Instance.particleTexture != null)
                         return s_Instance.particleTexture;
                     return defaultParticleTexture;
@@ -96,8 +111,7 @@ public Texture2D noiseTexture
             {
                 get
                 {
-                    if (s_Instance == null)
-                        s_Instance = FindObjectOfType<VFXResources>();
+                    LoadUserResourcesIfNeeded();
                     if (s_Instance != null && s_Instance.noiseTexture != null)
                         return s_Instance.noiseTexture;
                     return defaultNoiseTexture;
@@ -107,8 +121,7 @@ public Texture3D vectorField
             {
                 get
                 {
-                    if (s_Instance == null)
-                        s_Instance = FindObjectOfType<VFXResources>();
+                    LoadUserResourcesIfNeeded();
                     if (s_Instance != null && s_Instance.vectorField != null)
                         return s_Instance.vectorField;
                     return defaultVectorField;
@@ -118,8 +131,7 @@ public Texture3D signedDistanceField
             {
                 get
                 {
-                    if (s_Instance == null)
-                        s_Instance = FindObjectOfType<VFXResources>();
+                    LoadUserResourcesIfNeeded();
                     if (s_Instance != null && s_Instance.signedDistanceField != null)
                         return s_Instance.signedDistanceField;
                     return defaultSignedDistanceField;
@@ -130,8 +142,7 @@ public Mesh mesh
             {
                 get
                 {
-                    if (s_Instance == null)
-                        s_Instance = FindObjectOfType<VFXResources>();
+                    LoadUserResourcesIfNeeded();
                     if (s_Instance != null && s_Instance.mesh != null)
                         return s_Instance.mesh;
 

Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,34 @@ public static Values defaultResources`
`19`	`19`	`return s_Values;`
`20`	`20`	`}`
`21`	`21`	`}`
	`22`	`+ private static bool m_Searched; // the instance has been searched and it is null`
`22`	`23`	`private static VFXResources s_Instance;`
`23`	`24`	`private static Values s_Values;`
`24`	`25`
	`26`	`+ static void LoadUserResourcesIfNeeded()`
	`27`	`+ {`
	`28`	`+ if (s_Instance == null && (!m_Searched \|\| !object.ReferenceEquals(s_Instance,null)))`
	`29`	`+ // if instance is null and either it has never been searched or it was found but it has been destroyed since last time`
	`30`	`+ {`
	`31`	`+ foreach (var guid in AssetDatabase.FindAssets("t:VFXResources"))`
	`32`	`+ {`
	`33`	`+ s_Instance = AssetDatabase.LoadAssetAtPath<VFXResources>(AssetDatabase.GUIDToAssetPath(guid));`
	`34`	`+ if (s_Instance != null)`
	`35`	`+ {`
	`36`	`+ return;`
	`37`	`+ }`
	`38`	`+ }`
	`39`	`+ s_Instance = null;`
	`40`	`+ m_Searched = true;`
	`41`	`+ }`
	`42`	`+ }`
	`43`	`+`
`25`	`44`	`void OnEnable()`
`26`	`45`	`{`
`27`		`- if (Resources.FindObjectsOfTypeAll<VFXResources>().Length > 1)`
	`46`	`+ if (AssetDatabase.FindAssets("t:VFXResources").Length > 1)`
`28`	`47`	`Debug.LogError("Having more than on VFXResources in you project is unsupported");`
`29`	`48`	`s_Instance = this;`
	`49`	`+ m_Searched = false;`
`30`	`50`	`}`
`31`	`51`
`32`	`52`	`public class Values`
`@@ -35,8 +55,7 @@ public AnimationCurve animationCurve`
`35`	`55`	`{`
`36`	`56`	`get`
`37`	`57`	`{`
`38`		`- if (s_Instance == null)`
`39`		`- s_Instance = FindObjectOfType<VFXResources>();`
	`58`	`+ LoadUserResourcesIfNeeded();`
`40`	`59`	`if (s_Instance != null)`
`41`	`60`	`return s_Instance.animationCurve;`
`42`	`61`
`@@ -47,8 +66,7 @@ public Gradient gradient`
`47`	`66`	`{`
`48`	`67`	`get`
`49`	`68`	`{`
`50`		`- if (s_Instance == null)`
`51`		`- s_Instance = FindObjectOfType<VFXResources>();`
	`69`	`+ LoadUserResourcesIfNeeded();`
`52`	`70`	`if (s_Instance != null)`
`53`	`71`	`return s_Instance.gradient;`
`54`	`72`	`return defaultGradient;`
`@@ -58,8 +76,7 @@ public Gradient gradientMapRamp`
`58`	`76`	`{`
`59`	`77`	`get`
`60`	`78`	`{`
`61`		`- if (s_Instance == null)`
`62`		`- s_Instance = FindObjectOfType<VFXResources>();`
	`79`	`+ LoadUserResourcesIfNeeded();`
`63`	`80`	`if (s_Instance != null)`
`64`	`81`	`return s_Instance.gradientMapRamp;`
`65`	`82`	`return defaultGradientMapRamp;`
`@@ -70,8 +87,7 @@ public Shader shader`
`70`	`87`	`{`
`71`	`88`	`get`
`72`	`89`	`{`
`73`		`- if (s_Instance == null)`
`74`		`- s_Instance = FindObjectOfType<VFXResources>();`
	`90`	`+ LoadUserResourcesIfNeeded();`
`75`	`91`	`if (s_Instance != null && s_Instance.shader != null)`
`76`	`92`	`return s_Instance.shader;`
`77`	`93`
`@@ -84,8 +100,7 @@ public Texture2D particleTexture`
`84`	`100`	`{`
`85`	`101`	`get`
`86`	`102`	`{`
`87`		`- if (s_Instance == null)`
`88`		`- s_Instance = FindObjectOfType<VFXResources>();`
	`103`	`+ LoadUserResourcesIfNeeded();`
`89`	`104`	`if (s_Instance != null && s_Instance.particleTexture != null)`
`90`	`105`	`return s_Instance.particleTexture;`
`91`	`106`	`return defaultParticleTexture;`
`@@ -96,8 +111,7 @@ public Texture2D noiseTexture`
`96`	`111`	`{`
`97`	`112`	`get`
`98`	`113`	`{`
`99`		`- if (s_Instance == null)`
`100`		`- s_Instance = FindObjectOfType<VFXResources>();`
	`114`	`+ LoadUserResourcesIfNeeded();`
`101`	`115`	`if (s_Instance != null && s_Instance.noiseTexture != null)`
`102`	`116`	`return s_Instance.noiseTexture;`
`103`	`117`	`return defaultNoiseTexture;`
`@@ -107,8 +121,7 @@ public Texture3D vectorField`
`107`	`121`	`{`
`108`	`122`	`get`
`109`	`123`	`{`
`110`		`- if (s_Instance == null)`
`111`		`- s_Instance = FindObjectOfType<VFXResources>();`
	`124`	`+ LoadUserResourcesIfNeeded();`
`112`	`125`	`if (s_Instance != null && s_Instance.vectorField != null)`
`113`	`126`	`return s_Instance.vectorField;`
`114`	`127`	`return defaultVectorField;`
`@@ -118,8 +131,7 @@ public Texture3D signedDistanceField`
`118`	`131`	`{`
`119`	`132`	`get`
`120`	`133`	`{`
`121`		`- if (s_Instance == null)`
`122`		`- s_Instance = FindObjectOfType<VFXResources>();`
	`134`	`+ LoadUserResourcesIfNeeded();`
`123`	`135`	`if (s_Instance != null && s_Instance.signedDistanceField != null)`
`124`	`136`	`return s_Instance.signedDistanceField;`
`125`	`137`	`return defaultSignedDistanceField;`
`@@ -130,8 +142,7 @@ public Mesh mesh`
`130`	`142`	`{`
`131`	`143`	`get`
`132`	`144`	`{`
`133`		`- if (s_Instance == null)`
`134`		`- s_Instance = FindObjectOfType<VFXResources>();`
	`145`	`+ LoadUserResourcesIfNeeded();`
`135`	`146`	`if (s_Instance != null && s_Instance.mesh != null)`
`136`	`147`	`return s_Instance.mesh;`
`137`	`148`