Bumo to Unity 5.6.7f1

R-N · Apr 14, 2022 · a5f04aa · a5f04aa
1 parent 7a124b4
commit a5f04aa
Show file tree

Hide file tree

Showing 81 changed files with 262 additions and 128 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,3 +56,6 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
+
+Temp/
+build/
diff --git a/Assets/DistanceShad.shader b/Assets/DistanceShad.shader
@@ -1,4 +1,6 @@
-Shader "Unlit/DistanceShad"
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "Unlit/DistanceShad"
 {
 	Properties
 	{
@@ -31,7 +33,7 @@
 			v2f vert (appdata v)
 			{
 				v2f o;
-				o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+				o.vertex = UnityObjectToClipPos(v.vertex);
 				o.depth = o.vertex.zw;
 				return o;
 			}

diff --git a/Assets/MyMultiply.shader b/Assets/MyMultiply.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 // Upgrade NOTE: replaced '_Object2World' with 'unity_ObjectToWorld'
 
 Shader "Custom/My Multiply Shader" {
@@ -50,7 +52,7 @@ half tolerance;
 			v2f vert (appdata_t v)
 			{
 				v2f o;
-				o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+				o.vertex = UnityObjectToClipPos(v.vertex);
 				o.color = v.color;
 				o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex);
 				o.worldPosX = mul(unity_ObjectToWorld, float4(v.vertex.xyz * 0.9995f, v.vertex.w));

diff --git a/Assets/MyMultiply_2.shader b/Assets/MyMultiply_2.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Custom/My Multiply Shader Always" {
 Properties {
 	_MainTex ("Particle Texture", 2D) = "white" {}
@@ -41,7 +43,7 @@ half4 _PlyrColor;
 			v2f vert (appdata_t v)
 			{
 				v2f o;
-				o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+				o.vertex = UnityObjectToClipPos(v.vertex);
 				o.color = v.color;
 				o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex);
 				return o;

diff --git a/Assets/SampleScenes/Shaders/Skybox-Procedural.shader b/Assets/SampleScenes/Shaders/Skybox-Procedural.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 // Upgrade NOTE: replaced '_Object2World' with 'unity_ObjectToWorld'
 
 Shader "Skybox/Procedural" {
@@ -87,7 +89,7 @@ SubShader {
 		v2f vert (appdata_t v)
 		{
 			v2f OUT;
-			OUT.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+			OUT.pos = UnityObjectToClipPos(v.vertex);
 
 			float3 cameraPos = float3(0,kInnerRadius + kCameraHeight,0); 	// The camera's current position
 

diff --git a/Assets/Standard Assets/Effects/GlassRefraction/Shaders/GlassStainedBumpDistort.shader b/Assets/Standard Assets/Effects/GlassRefraction/Shaders/GlassStainedBumpDistort.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 // Per pixel bumped refraction.
 // Uses a normal map to distort the image behind, and
 // an additional texture to tint the color.
@@ -56,7 +58,7 @@ float4 _MainTex_ST;
 v2f vert (appdata_t v)
 {
 	v2f o;
-	o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+	o.vertex = UnityObjectToClipPos(v.vertex);
 	#if UNITY_UV_STARTS_AT_TOP
 	float scale = -1.0;
 	#else

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/BlendModesOverlay.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/BlendModesOverlay.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Hidden/BlendModesOverlay" {
 	Properties {
 		_MainTex ("Screen Blended", 2D) = "" {}
@@ -22,7 +24,7 @@ Shader "Hidden/BlendModesOverlay" {
 
 	v2f vert( appdata_img v ) { 
 		v2f o;
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 
 		o.uv[0] = float2(
 			dot(v.texcoord.xy, _UV_Transform.xy),

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/BlurEffectConeTaps.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/BlurEffectConeTaps.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Hidden/BlurEffectConeTap" {
 	Properties { _MainTex ("", any) = "" {} }
 	CGINCLUDE
@@ -12,7 +14,7 @@ Shader "Hidden/BlurEffectConeTap" {
 	half4 _BlurOffsets;
 	v2f vert( appdata_img v ) {
 		v2f o; 
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 		o.uv = v.texcoord - _BlurOffsets.xy * _MainTex_TexelSize.xy; // hack, see BlurEffect.cs for the reason for this. let's make a new blur effect soon
 		o.taps[0] = o.uv + _MainTex_TexelSize * _BlurOffsets.xy;
 		o.taps[1] = o.uv - _MainTex_TexelSize * _BlurOffsets.xy;

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/CameraMotionBlur.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/CameraMotionBlur.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
  /*
  	CAMERA MOTION BLUR IMAGE EFFECTS
 
@@ -88,7 +90,7 @@
 	v2f vert(appdata_img v) 
 	{
 		v2f o;
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 		o.uv = v.texcoord.xy;
 		return o;
 	}

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/CameraMotionBlurDX11.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/CameraMotionBlurDX11.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
  /*
  	NOTES: see CameraMotionBlur.shader
  */
@@ -50,7 +52,7 @@
 	v2f vert(appdata_img v) 
 	{
 		v2f o;
-		o.pos = mul (UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos (v.vertex);
 		o.uv = v.texcoord.xy;
 		return o;
 	}

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ChromaticAberrationShader.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ChromaticAberrationShader.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Hidden/ChromaticAberration" {
 	Properties {
 		_MainTex ("Base", 2D) = "" {}
@@ -23,7 +25,7 @@ Shader "Hidden/ChromaticAberration" {
 	v2f vert( appdata_img v ) 
 	{
 		v2f o;
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 		o.uv = v.texcoord.xy;
 
 		return o;

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrection3DLut.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrection3DLut.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Hidden/ColorCorrection3DLut" {
 	Properties {
 		_MainTex ("Base (RGB)", 2D) = "" {}		
@@ -21,7 +23,7 @@ float _Offset;
 v2f vert( appdata_img v ) 
 {
 	v2f o;
-	o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+	o.pos = UnityObjectToClipPos(v.vertex);
 	o.uv =  v.texcoord.xy;	
 	return o;
 } 

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionCurves.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionCurves.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Hidden/ColorCorrectionCurves" {
 	Properties {
 		_MainTex ("Base (RGB)", 2D) = "" {}
@@ -39,7 +41,7 @@ Shader "Hidden/ColorCorrectionCurves" {
 	v2f vert( appdata_img v ) 
 	{
 		v2f o;
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 		o.uv =  v.texcoord.xy;
 		o.uv2 = TRANSFORM_TEX(v.texcoord, _CameraDepthTexture);
 

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionCurvesSimple.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionCurvesSimple.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Hidden/ColorCorrectionCurvesSimple" {
 	Properties {
 		_MainTex ("Base (RGB)", 2D) = "" {}
@@ -21,7 +23,7 @@ Shader "Hidden/ColorCorrectionCurvesSimple" {
 	v2f vert( appdata_img v ) 
 	{
 		v2f o;
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 		o.uv = v.texcoord.xy;
 		return o;
 	} 

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionSelective.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionSelective.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Hidden/ColorCorrectionSelective" {
 	Properties {
 		_MainTex ("Base (RGB)", 2D) = "" {}
@@ -19,7 +21,7 @@ Shader "Hidden/ColorCorrectionSelective" {
 
 	v2f vert( appdata_img v ) {
 		v2f o;
-		o.pos = mul (UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos (v.vertex);
 		o.uv = v.texcoord.xy;
 		return o;
 	} 

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/Contrast Stretch/Apply.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/Contrast Stretch/Apply.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 // Final pass in the contrast stretch effect: apply
 // color stretch to the original image, based on currently
 // adapted to minimum/maximum luminances.
@@ -29,7 +31,7 @@ uniform sampler2D _AdaptTex;
 v2f vert (appdata_img v)
 {
 	v2f o;
-	o.pos = mul (UNITY_MATRIX_MVP, v.vertex);
+	o.pos = UnityObjectToClipPos (v.vertex);
 	o.uv[0] = MultiplyUV (UNITY_MATRIX_TEXTURE0, v.texcoord);
 	o.uv[1] = float2(0.5,0.5);
 	return o;

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/Contrast Stretch/MinMaxReduction.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/Contrast Stretch/MinMaxReduction.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 // Reduces input image (_MainTex) by 2x2.
 // Outputs maximum value in R, minimum in G.
 Shader "Hidden/Contrast Stretch Reduction" {
@@ -25,7 +27,7 @@ uniform sampler2D _MainTex;
 
 v2f vert (appdata_img v) {
 	v2f o;
-	o.position = mul (UNITY_MATRIX_MVP, v.vertex);
+	o.position = UnityObjectToClipPos (v.vertex);
 	float2 uv = MultiplyUV (UNITY_MATRIX_TEXTURE0, v.texcoord);
 
 	// Compute UVs to sample 2x2 pixel block.

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ContrastComposite.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ContrastComposite.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Hidden/ContrastComposite" {
 	Properties {
 		_MainTex ("Base (RGB)", 2D) = "" {}
@@ -24,7 +26,7 @@ Shader "Hidden/ContrastComposite" {
 
 	v2f vert( appdata_img v ) {
 		v2f o;
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 
 		o.uv[0] = v.texcoord.xy;
 		o.uv[1] = v.texcoord.xy;

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ConvertDepth.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ConvertDepth.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Hidden/ConvertDepth" {
 	Properties {
 		_MainTex ("Base (RGB)", 2D) = "" {}
@@ -19,7 +21,7 @@ Shader "Hidden/ConvertDepth" {
 	v2f vert( appdata_img v ) 
 	{
 		v2f o;
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 		o.uv =  v.texcoord.xy;
 		return o;
 	}

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/CreaseApply.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/CreaseApply.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 
 
 Shader "Hidden/CreaseApply" {
@@ -32,7 +34,7 @@ struct v2f {
 v2f vert( appdata_img v )
 {
 	v2f o;
-	o.pos = mul (UNITY_MATRIX_MVP, v.vertex);
+	o.pos = UnityObjectToClipPos (v.vertex);
 	o.uv.xy = v.texcoord.xy;
 	return o;
 }

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/EdgeDetectNormals.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/EdgeDetectNormals.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 
 Shader "Hidden/EdgeDetect" { 
 	Properties {
@@ -40,7 +42,7 @@ Shader "Hidden/EdgeDetect" {
 	v2flum vertLum (appdata_img v)
 	{
 		v2flum o;
-		o.pos = mul (UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos (v.vertex);
 		float2 uv = MultiplyUV( UNITY_MATRIX_TEXTURE0, v.texcoord );
 		o.uv[0] = uv;
 		o.uv[1] = uv + float2(-_MainTex_TexelSize.x, -_MainTex_TexelSize.y) * _SampleDistance;
@@ -90,7 +92,7 @@ Shader "Hidden/EdgeDetect" {
 	v2f vertRobert( appdata_img v ) 
 	{
 		v2f o;
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 
 		float2 uv = v.texcoord.xy;
 		o.uv[0] = uv;
@@ -114,7 +116,7 @@ Shader "Hidden/EdgeDetect" {
 	v2f vertThin( appdata_img v )
 	{
 		v2f o;
-		o.pos = mul (UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos (v.vertex);
 
 		float2 uv = v.texcoord.xy;
 		o.uv[0] = uv;
@@ -137,7 +139,7 @@ Shader "Hidden/EdgeDetect" {
 	v2fd vertD( appdata_img v )
 	{
 		v2fd o;
-		o.pos = mul (UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos (v.vertex);
 
 		float2 uv = v.texcoord.xy;
 		o.uv[0] = uv;

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/FisheyeShader.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/FisheyeShader.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Hidden/FisheyeShader" {
 	Properties {
 		_MainTex ("Base (RGB)", 2D) = "" {}
@@ -20,7 +22,7 @@ Shader "Hidden/FisheyeShader" {
 	v2f vert( appdata_img v ) 
 	{
 		v2f o;
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 		o.uv = v.texcoord.xy;
 		return o;
 	} 

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/GlobalFog.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/GlobalFog.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Hidden/GlobalFog" {
 Properties {
 	_MainTex ("Base (RGB)", 2D) = "black" {}
@@ -44,7 +46,7 @@ CGINCLUDE
 		v2f o;
 		half index = v.vertex.z;
 		v.vertex.z = 0.1;
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 		o.uv = v.texcoord.xy;
 		o.uv_depth = v.texcoord.xy;
 

diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/MotionBlur.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/MotionBlur.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Hidden/MotionBlur" {
 Properties {
 	_MainTex ("Base (RGB)", 2D) = "white" {}
@@ -36,7 +38,7 @@ Properties {
 			v2f vert (appdata_t v)
 			{
 				v2f o;
-				o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+				o.vertex = UnityObjectToClipPos(v.vertex);
 				o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
 				return o;
 			}
@@ -80,7 +82,7 @@ Properties {
 			v2f vert (appdata_t v)
 			{
 				v2f o;
-				o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+				o.vertex = UnityObjectToClipPos(v.vertex);
 				o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
 				return o;
 			}