fix: materials in geometry render queue sometimes have cutoff (#14)

Kinerius · web-flow · commit e9b72220a5c3 · 2022-12-05T15:34:05.000-03:00
* fix: materials in geometry render queue sometimes have cutoff

* Updated version and changelog
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+#1.1.3
+- Pulled changes from https://github.com/decentraland/unity-renderer/pull/3667
+
 #1.1.2
 - Changed the gltfast dependency repository
 
diff --git a/Runtime/Shaders/ShaderUtils.cs b/Runtime/Shaders/ShaderUtils.cs
@@ -117,6 +117,7 @@ public static void UpgradeMaterial_2020_To_2021(Material material)
             int originalRenderQueue = material.renderQueue;
             material.shader = Shader.Find("DCL/Universal Render Pipeline/Lit");
             material.renderQueue = originalRenderQueue;
+            float cutoff = material.GetFloat(Cutoff);
 
             if (material.HasTexture(BumpMap) && material.GetTexture(BumpMap) != null)
                 material.EnableKeyword(NormalMapKeyword);
@@ -135,7 +136,7 @@ public static void UpgradeMaterial_2020_To_2021(Material material)
                 return;
             }
 
-            if (originalRenderQueue > 2600)
+            if (originalRenderQueue > 2600 || cutoff > 0)
             {
                 material.SetOverrideTag(RenderType, TransparentCutout);
                 material.SetInt(SrcBlend, (int)BlendMode.One);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.decentraland.unity-shared-dependencies",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "displayName": "Unity Shared Dependencies",
   "description": "This package contains shared dependencies between unity-renderer and asset-bundle-converter repositories, this includes gltf importer wrappers and shaders",
   "unity": "2021.3",

-Original file line number
+Diff line change
@@ @@ -1,3 +1,6 @@ @@
 +#1.1.3
 +- Pulled changes from https://github.com/decentraland/unity-renderer/pull/3667
++
 #1.1.2
 - Changed the gltfast dependency repository
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ public static void UpgradeMaterial_2020_To_2021(Material material)`
`117`	`117`	`int originalRenderQueue = material.renderQueue;`
`118`	`118`	`material.shader = Shader.Find("DCL/Universal Render Pipeline/Lit");`
`119`	`119`	`material.renderQueue = originalRenderQueue;`
	`120`	`+ float cutoff = material.GetFloat(Cutoff);`
`120`	`121`
`121`	`122`	`if (material.HasTexture(BumpMap) && material.GetTexture(BumpMap) != null)`
`122`	`123`	`material.EnableKeyword(NormalMapKeyword);`
`@@ -135,7 +136,7 @@ public static void UpgradeMaterial_2020_To_2021(Material material)`
`135`	`136`	`return;`
`136`	`137`	`}`
`137`	`138`
`138`		`- if (originalRenderQueue > 2600)`
	`139`	`+ if (originalRenderQueue > 2600 \|\| cutoff > 0)`
`139`	`140`	`{`
`140`	`141`	`material.SetOverrideTag(RenderType, TransparentCutout);`
`141`	`142`	`material.SetInt(SrcBlend, (int)BlendMode.One);`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.decentraland.unity-shared-dependencies",`
`3`		`- "version": "1.1.2",`
	`3`	`+ "version": "1.1.3",`
`4`	`4`	`"displayName": "Unity Shared Dependencies",`
`5`	`5`	`"description": "This package contains shared dependencies between unity-renderer and asset-bundle-converter repositories, this includes gltf importer wrappers and shaders",`
`6`	`6`	`"unity": "2021.3",`