Make 5.3.2p1 compatible

firtoz · Feb 10, 2016 · 8bbe919 · 8bbe919
1 parent c7e33e0
commit 8bbe919
Show file tree

Hide file tree

Showing 7 changed files with 537 additions and 99 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.meta
diff --git a/Shaders/Standard.mat b/Shaders/Standard.mat
@@ -0,0 +1,138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Standard
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: CLIP_ONE
+  m_LightmapFlags: 5
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _BumpMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailNormalMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _ParallaxMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _OcclusionMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _EmissionMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailMask
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailAlbedoMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _MetallicGlossMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats:
+      data:
+        first:
+          name: _SrcBlend
+        second: 1
+      data:
+        first:
+          name: _DstBlend
+        second: 0
+      data:
+        first:
+          name: _Cutoff
+        second: 0.5
+      data:
+        first:
+          name: _Parallax
+        second: 0.02
+      data:
+        first:
+          name: _ZWrite
+        second: 1
+      data:
+        first:
+          name: _Glossiness
+        second: 0.5
+      data:
+        first:
+          name: _BumpScale
+        second: 1
+      data:
+        first:
+          name: _OcclusionStrength
+        second: 1
+      data:
+        first:
+          name: _DetailNormalMapScale
+        second: 1
+      data:
+        first:
+          name: _UVSec
+        second: 0
+      data:
+        first:
+          name: _Mode
+        second: 0
+      data:
+        first:
+          name: _Metallic
+        second: 0
+    m_Colors:
+      data:
+        first:
+          name: _EmissionColor
+        second: {r: 0, g: 0, b: 0, a: 1}
+      data:
+        first:
+          name: _Color
+        second: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Shaders/StandardClippable.mat b/Shaders/StandardClippable.mat
@@ -0,0 +1,170 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: StandardClippable
+  m_Shader: {fileID: 4800000, guid: 5ff29455d94cbf144931df4d8a4e5375, type: 3}
+  m_ShaderKeywords: CLIP_ONE _EMISSION
+  m_LightmapFlags: 1
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _BumpMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailNormalMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _ParallaxMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _OcclusionMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _EmissionMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailMask
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailAlbedoMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _MetallicGlossMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats:
+      data:
+        first:
+          name: _SrcBlend
+        second: 1
+      data:
+        first:
+          name: _DstBlend
+        second: 0
+      data:
+        first:
+          name: _Cutoff
+        second: 0.5
+      data:
+        first:
+          name: _Parallax
+        second: 0.02
+      data:
+        first:
+          name: _ZWrite
+        second: 1
+      data:
+        first:
+          name: _Glossiness
+        second: 0.5
+      data:
+        first:
+          name: _BumpScale
+        second: 1
+      data:
+        first:
+          name: _OcclusionStrength
+        second: 1
+      data:
+        first:
+          name: _DetailNormalMapScale
+        second: 1
+      data:
+        first:
+          name: _UVSec
+        second: 0
+      data:
+        first:
+          name: _Mode
+        second: 0
+      data:
+        first:
+          name: _Metallic
+        second: 0
+      data:
+        first:
+          name: _EmissionScaleUI
+        second: 0
+    m_Colors:
+      data:
+        first:
+          name: _EmissionColor
+        second: {r: 1, g: 1, b: 1, a: 1}
+      data:
+        first:
+          name: _Color
+        second: {r: 1, g: 1, b: 1, a: 1}
+      data:
+        first:
+          name: _EmissionColorUI
+        second: {r: 1, g: 1, b: 1, a: 1}
+      data:
+        first:
+          name: _planePos
+        second: {r: 0, g: 0, b: 0, a: 0}
+      data:
+        first:
+          name: _planePos2
+        second: {r: 0, g: 0, b: 0, a: 1}
+      data:
+        first:
+          name: _planePos3
+        second: {r: 0, g: 0, b: 0, a: 1}
+      data:
+        first:
+          name: _planeNorm
+        second: {r: 0, g: 1, b: 0, a: 0}
+      data:
+        first:
+          name: _planeNorm2
+        second: {r: 0, g: 1, b: 0, a: 1}
+      data:
+        first:
+          name: _planeNorm3
+        second: {r: 0, g: 1, b: 0, a: 1}
diff --git a/Shaders/StandardClippable.shader b/Shaders/StandardClippable.shader
@@ -30,9 +30,6 @@ Shader "Custom/StandardClippable" {
 
 		[Enum(UV0,0,UV1,1)] _UVSec ("UV Set for secondary textures", Float) = 0
 
-		// UI-only data
-		[HideInInspector] _EmissionScaleUI("Scale", Float) = 0.0
-		[HideInInspector] _EmissionColorUI("Color", Color) = (1,1,1)
 
 		// Blending state
 		[HideInInspector] _Mode ("__mode", Float) = 0.0
@@ -85,13 +82,11 @@ Shader "Custom/StandardClippable" {
 
 			#pragma multi_compile_fwdbase
 			#pragma multi_compile_fog
-
-			#pragma vertex vertForwardBase
-			#pragma fragment fragForwardBase
 
 			#pragma multi_compile __ CLIP_ONE CLIP_TWO CLIP_THREE
-
-			#include "standard_clipped.cginc"
+			#pragma vertex vertBase
+			#pragma fragment fragBase
+			#include "UnityStandardCoreForwardClippable.cginc"
 
 			ENDCG
 		}
@@ -122,13 +117,12 @@ Shader "Custom/StandardClippable" {
 
 			#pragma multi_compile_fwdadd_fullshadows
 			#pragma multi_compile_fog
-
-			#pragma vertex vertForwardAdd
-			#pragma fragment fragForwardAdd
 
 			#pragma multi_compile __ CLIP_ONE CLIP_TWO CLIP_THREE
+			#pragma vertex vertAdd
+			#pragma fragment fragAdd
 
-			#include "standard_clipped.cginc"
+			#include "UnityStandardCoreForwardClippable.cginc"
 
 			ENDCG
 		}
@@ -249,13 +243,11 @@ Shader "Custom/StandardClippable" {
 
 			#pragma multi_compile_fwdbase
 			#pragma multi_compile_fog
-
-			#pragma vertex vertForwardBase
-			#pragma fragment fragForwardBase
-
 			#pragma multi_compile __ CLIP_ONE CLIP_TWO CLIP_THREE
 
-			#include "standard_clipped.cginc"
+			#pragma vertex vertBase
+			#pragma fragment fragBase
+			#include "UnityStandardCoreForwardClippable.cginc"
 
 			ENDCG
 		}
@@ -283,12 +275,10 @@ Shader "Custom/StandardClippable" {
 			#pragma multi_compile_fwdadd_fullshadows
 			#pragma multi_compile_fog
 
-			#pragma vertex vertForwardAdd
-			#pragma fragment fragForwardAdd
-
 			#pragma multi_compile __ CLIP_ONE CLIP_TWO CLIP_THREE
-
-			#include "standard_clipped.cginc"
+			#pragma vertex vertAdd
+			#pragma fragment fragAdd
+			#include "UnityStandardCoreForwardClippable.cginc"
 
 			ENDCG
 		}
@@ -340,6 +330,7 @@ Shader "Custom/StandardClippable" {
 		}
 	}
 
+
 	FallBack "VertexLit"
 	CustomEditor "StandardShaderGUI"
 }