Simplify a lot of things, include base scripts instead of editing them

firtoz · Jan 21, 2017 · 922d07f · 922d07f
1 parent 0b84924
commit 922d07f
Show file tree

Hide file tree

Showing 5 changed files with 213 additions and 614 deletions.
diff --git a/Shaders/StandardClippable.shader b/Shaders/StandardClippable.shader
@@ -145,8 +145,8 @@ Shader "Custom/StandardClippable" {
 			#pragma shader_feature _ _ALPHATEST_ON _ALPHABLEND_ON _ALPHAPREMULTIPLY_ON
 			#pragma multi_compile_shadowcaster
 
-			#pragma vertex vertShadowCaster
-			#pragma fragment fragShadowCaster
+			#pragma vertex vertShadowCasterClip
+			#pragma fragment fragShadowCasterClip
 
 			#pragma multi_compile __ CLIP_ONE CLIP_TWO CLIP_THREE
 
@@ -297,8 +297,8 @@ Shader "Custom/StandardClippable" {
 			#pragma skip_variants SHADOWS_SOFT
 			#pragma multi_compile_shadowcaster
 
-			#pragma vertex vertShadowCaster
-			#pragma fragment fragShadowCaster
+			#pragma vertex vertShadowCasterClip
+			#pragma fragment fragShadowCasterClip
 
 			#pragma multi_compile __ CLIP_ONE CLIP_TWO CLIP_THREE
 

diff --git a/Shaders/StandardSpecularClippable.shader b/Shaders/StandardSpecularClippable.shader
@@ -145,8 +145,8 @@ Shader "Custom/StandardSpecularClippable"
 			#pragma shader_feature _ _ALPHATEST_ON _ALPHABLEND_ON _ALPHAPREMULTIPLY_ON
 			#pragma multi_compile_shadowcaster
 
-			#pragma vertex vertShadowCaster
-			#pragma fragment fragShadowCaster
+			#pragma vertex vertShadowCasterClip
+			#pragma fragment fragShadowCasterClip
 
 			#pragma multi_compile __ CLIP_ONE CLIP_TWO CLIP_THREE
 			#include "standard_shadow_clipped.cginc"
@@ -180,8 +180,8 @@ Shader "Custom/StandardSpecularClippable"
 			#pragma multi_compile DIRLIGHTMAP_OFF DIRLIGHTMAP_COMBINED DIRLIGHTMAP_SEPARATE
 			#pragma multi_compile DYNAMICLIGHTMAP_OFF DYNAMICLIGHTMAP_ON
 
-			#pragma vertex vertDeferred
-			#pragma fragment fragDeferred
+			#pragma vertex vertDeferredClip
+			#pragma fragment fragDeferredClip
 
 			#pragma multi_compile __ CLIP_ONE CLIP_TWO CLIP_THREE
 			#include "standard_clipped.cginc"

diff --git a/Shaders/UnityStandardCoreForwardClippable.cginc b/Shaders/UnityStandardCoreForwardClippable.cginc
@@ -15,10 +15,10 @@
 	half4 fragAdd (VertexOutputForwardAddSimple i) : SV_Target { return fragForwardAddSimpleInternal(i); }
 #else
 	#include "standard_clipped.cginc"
-	VertexOutputForwardBase vertBase (VertexInput v) { return vertForwardBase(v); }
-	VertexOutputForwardAdd vertAdd (VertexInput v) { return vertForwardAdd(v); }
-	half4 fragBase (VertexOutputForwardBase i) : SV_Target { return fragForwardBaseInternal(i); }
-	half4 fragAdd (VertexOutputForwardAdd i) : SV_Target { return fragForwardAddInternal(i); }
+	VertexOutputForwardClipBase vertBase (VertexInput v) { return vertForwardClipBase(v); }
+	VertexOutputForwardClipAdd vertAdd (VertexInput v) { return vertForwardClipAdd(v); }
+	half4 fragBase (VertexOutputForwardClipBase i) : SV_Target { return fragForwardClipBaseInternal(i); }
+	half4 fragAdd (VertexOutputForwardClipAdd i) : SV_Target { return fragForwardClipAddInternal(i); }
 #endif
 
 #endif // UNITY_STANDARD_CORE_FORWARD_INCLUDED