From 26129a8354d44c1e4f39a3301fe690a78d19fd2d Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Mon, 29 Jun 2020 19:13:51 -0700 Subject: [PATCH] Disable projection onto decal shaders --- Assets/Shaders/DecalFeatureBumped.shader | 2 +- Assets/Shaders/DecalPaint.shader | 2 +- Assets/Shaders/DecalPaintSDF.shader | 2 +- Assets/Shaders/DecalPaintSpecular.shader | 2 +- Assets/Shaders/DecalPaintSpecularSDF.shader | 2 +- Assets/Shaders/SelectionGlow.shader | 2 +- GameData/ConformalDecals/Resources/conformaldecals.shab | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/Shaders/DecalFeatureBumped.shader b/Assets/Shaders/DecalFeatureBumped.shader index bbdeacb..c670c5b 100644 --- a/Assets/Shaders/DecalFeatureBumped.shader +++ b/Assets/Shaders/DecalFeatureBumped.shader @@ -22,7 +22,7 @@ Shader "ConformalDecals/Feature/Bumped" } SubShader { - Tags { "Queue" = "Geometry+100" } + Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"} Cull [_Cull] Ztest LEqual diff --git a/Assets/Shaders/DecalPaint.shader b/Assets/Shaders/DecalPaint.shader index 7543afd..754989d 100644 --- a/Assets/Shaders/DecalPaint.shader +++ b/Assets/Shaders/DecalPaint.shader @@ -25,7 +25,7 @@ Shader "ConformalDecals/Paint/Diffuse" } SubShader { - Tags { "Queue" = "Geometry+100" } + Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"} Cull [_Cull] Ztest LEqual diff --git a/Assets/Shaders/DecalPaintSDF.shader b/Assets/Shaders/DecalPaintSDF.shader index 633ebca..9070a02 100644 --- a/Assets/Shaders/DecalPaintSDF.shader +++ b/Assets/Shaders/DecalPaintSDF.shader @@ -27,7 +27,7 @@ Shader "ConformalDecals/Paint/DiffuseSDF" } SubShader { - Tags { "Queue" = "Geometry+100" } + Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"} Cull [_Cull] Ztest LEqual diff --git a/Assets/Shaders/DecalPaintSpecular.shader b/Assets/Shaders/DecalPaintSpecular.shader index 88b8713..d577d36 100644 --- a/Assets/Shaders/DecalPaintSpecular.shader +++ b/Assets/Shaders/DecalPaintSpecular.shader @@ -30,7 +30,7 @@ Shader "ConformalDecals/Paint/Specular" } SubShader { - Tags { "Queue" = "Geometry+100" } + Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"} Cull [_Cull] Ztest LEqual diff --git a/Assets/Shaders/DecalPaintSpecularSDF.shader b/Assets/Shaders/DecalPaintSpecularSDF.shader index 7c253a9..59575b6 100644 --- a/Assets/Shaders/DecalPaintSpecularSDF.shader +++ b/Assets/Shaders/DecalPaintSpecularSDF.shader @@ -32,7 +32,7 @@ Shader "ConformalDecals/Paint/SpecularSDF" } SubShader { - Tags { "Queue" = "Geometry+100" } + Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"} Cull [_Cull] Ztest LEqual diff --git a/Assets/Shaders/SelectionGlow.shader b/Assets/Shaders/SelectionGlow.shader index 217850f..fd75aa8 100644 --- a/Assets/Shaders/SelectionGlow.shader +++ b/Assets/Shaders/SelectionGlow.shader @@ -12,7 +12,7 @@ Shader "ConformalDecals/SelectionGlow" } SubShader { - Tags { "Queue" = "Transparent" } + Tags { "Queue" = "Transparent" "IgnoreProjector" = "true" } Cull Back ZWrite Off diff --git a/GameData/ConformalDecals/Resources/conformaldecals.shab b/GameData/ConformalDecals/Resources/conformaldecals.shab index d2a05c7..e24bce0 100644 --- a/GameData/ConformalDecals/Resources/conformaldecals.shab +++ b/GameData/ConformalDecals/Resources/conformaldecals.shab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6021352c2c8a9fe77df77838ae961d4ccaeeef51295bcdecbb798cfbbad00a52 -size 170261 +oid sha256:0f28c5cee84474aed6d74cb4d6be9a996ae8bc8791b60d12009605f3dc913d65 +size 170325