Update Unity version.

XJINE · XJINE · commit 858ddd438a36 · 2021-01-04T10:56:09.000+09:00
diff --git a/Assets/02_UnlitShader/UnlitShader.shader b/Assets/02_UnlitShader/UnlitShader.shader
@@ -6,7 +6,7 @@
         {
             CGPROGRAM
 
-            #pragma vertex vert
+            #pragma vertex   vert
             #pragma fragment frag
 
             #include "UnityCG.cginc"
diff --git a/Assets/03_Properties/ColorProperty.shader b/Assets/03_Properties/ColorProperty.shader
@@ -11,7 +11,7 @@
         {
             CGPROGRAM
 
-            #pragma vertex vert
+            #pragma vertex   vert
             #pragma fragment frag
 
             #include "UnityCG.cginc"
diff --git a/Assets/03_Properties/RangeProperty.shader b/Assets/03_Properties/RangeProperty.shader
@@ -15,7 +15,7 @@
         {
             CGPROGRAM
 
-            #pragma vertex vert
+            #pragma vertex   vert
             #pragma fragment frag
 
             #include "UnityCG.cginc"
diff --git a/Assets/04_TextureMap/TextureMap.shader b/Assets/04_TextureMap/TextureMap.shader
@@ -11,21 +11,21 @@
         {
             CGPROGRAM
 
-            #pragma vertex vert
+            #pragma vertex   vert
             #pragma fragment frag
 
             #include "UnityCG.cginc"
 
             struct appdata
             {
                 float4 vertex : POSITION;
-                float2 uv : TEXCOORD;
+                float2 uv     : TEXCOORD;
             };
 
             struct v2f
             {
                 float4 vertex : SV_POSITION;
-                float2 uv : TEXCOORD;
+                float2 uv     : TEXCOORD;
             };
 
             sampler2D _MainTex;
@@ -34,7 +34,7 @@
             {
                 v2f o;
                 o.vertex = UnityObjectToClipPos(v.vertex);
-                o.uv = v.uv;
+                o.uv     = v.uv;
                 return o;
             }
 
diff --git a/Assets/04_TextureMap/TransformTex.shader b/Assets/04_TextureMap/TransformTex.shader
@@ -12,31 +12,31 @@
         {
             CGPROGRAM
 
-            #pragma vertex vert
+            #pragma vertex   vert
             #pragma fragment frag
 
             #include "UnityCG.cginc"
 
             struct appdata
             {
                 float4 vertex : POSITION;
-                float2 uv : TEXCOORD;
+                float2 uv     : TEXCOORD;
             };
 
             struct v2f
             {
                 float4 vertex : SV_POSITION;
-                float2 uv : TEXCOORD;
+                float2 uv     : TEXCOORD;
             };
 
             sampler2D _MainTex;
-            float4 _MainTex_ST;
+            float4    _MainTex_ST;
 
             v2f vert(appdata v)
             {
                 v2f o;
                 o.vertex = UnityObjectToClipPos(v.vertex);
-                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                o.uv     = TRANSFORM_TEX(v.uv, _MainTex);
                 return o;
             }
 
diff --git a/Assets/05_VertexFragment/FragmentShader.shader b/Assets/05_VertexFragment/FragmentShader.shader
@@ -11,31 +11,31 @@
         {
             CGPROGRAM
 
-            #pragma vertex vert
+            #pragma vertex   vert
             #pragma fragment frag
 
             #include "UnityCG.cginc"
 
             struct appdata
             {
                 float4 vertex : POSITION;
-                float2 uv : TEXCOORD;
+                float2 uv     : TEXCOORD;
             };
 
             struct v2f
             {
                 float4 vertex : SV_POSITION;
-                float2 uv : TEXCOORD;
+                float2 uv     : TEXCOORD;
             };
 
             sampler2D _MainTex;
-            float4 _MainTex_ST;
+            float4    _MainTex_ST;
 
             v2f vert(appdata v)
             {
                 v2f o;
                 o.vertex = UnityObjectToClipPos(v.vertex);
-                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                o.uv     = TRANSFORM_TEX(v.uv, _MainTex);
                 return o;
             }
 
diff --git a/Assets/05_VertexFragment/VertexShader.shader b/Assets/05_VertexFragment/VertexShader.shader
@@ -11,25 +11,25 @@
         {
             CGPROGRAM
 
-            #pragma vertex vert
+            #pragma vertex   vert
             #pragma fragment frag
 
             #include "UnityCG.cginc"
 
             struct appdata
             {
                 float4 vertex : POSITION;
-                float2 uv : TEXCOORD;
+                float2 uv     : TEXCOORD;
             };
 
             struct v2f
             {
                 float4 vertex : SV_POSITION;
-                float2 uv : TEXCOORD;
+                float2 uv     : TEXCOORD;
             };
 
             sampler2D _MainTex;
-            float4 _MainTex_ST;
+            float4    _MainTex_ST;
 
             v2f vert(appdata v)
             {
@@ -41,7 +41,8 @@
                 }
 
                 o.vertex = UnityObjectToClipPos(v.vertex);
-                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                o.uv     = TRANSFORM_TEX(v.uv, _MainTex);
+
                 return o;
             }
 
diff --git a/Assets/06_Culling/Culling.shader b/Assets/06_Culling/Culling.shader
@@ -13,7 +13,7 @@
         {
             CGPROGRAM
 
-            #pragma vertex vert
+            #pragma vertex   vert
             #pragma fragment frag
 
             #include "UnityCG.cginc"
diff --git a/Assets/07_ZTest/Offset.shader b/Assets/07_ZTest/Offset.shader
@@ -7,14 +7,14 @@
 
     SubShader
     {
-        ZTest LEqual
+        ZTest  LEqual
         Offset -1, -1
 
         Pass
         {
             CGPROGRAM
 
-            #pragma vertex vert
+            #pragma vertex   vert
             #pragma fragment frag
 
             #include "UnityCG.cginc"
diff --git a/Assets/07_ZTest/ZTest.shader b/Assets/07_ZTest/ZTest.shader
@@ -13,7 +13,7 @@
         {
             CGPROGRAM
 
-            #pragma vertex vert
+            #pragma vertex   vert
             #pragma fragment frag
 
             #include "UnityCG.cginc"
diff --git a/Assets/08_Blending/Blending.shader b/Assets/08_Blending/Blending.shader
@@ -23,7 +23,7 @@
         {
             CGPROGRAM
 
-            #pragma vertex vert
+            #pragma vertex   vert
             #pragma fragment frag
 
             #include "UnityCG.cginc"
diff --git a/Assets/09_ZWrite/ZWrite.shader b/Assets/09_ZWrite/ZWrite.shader
@@ -2,8 +2,8 @@
 {
     Properties
     {
-        _MainTex("Texture", 2D) = "white" {}
-        _Color("Color", Color) = (1, 1, 1, 1)
+        _MainTex("Texture", 2D)    = "white" {}
+        _Color  ("Color",   Color) = (1, 1, 1, 1)
     }
 
     SubShader
@@ -16,38 +16,38 @@
 
         Cull   Off
         ZWrite Off
-        Blend SrcAlpha OneMinusSrcAlpha
+        Blend  SrcAlpha OneMinusSrcAlpha
 
         Pass
         {
             CGPROGRAM
 
-            #pragma vertex vert
+            #pragma vertex   vert
             #pragma fragment frag
 
             #include "UnityCG.cginc"
 
             struct appdata
             {
                 float4 vertex : POSITION;
-                float2 uv : TEXCOORD0;
+                float2 uv     : TEXCOORD0;
             };
 
             struct v2f
             {
-                float2 uv : TEXCOORD0;
                 float4 vertex : SV_POSITION;
+                float2 uv     : TEXCOORD0;
             };
 
             sampler2D _MainTex;
-            float4 _MainTex_ST;
-            fixed4 _Color;
+            float4    _MainTex_ST;
+            fixed4    _Color;
 
             v2f vert(appdata v)
             {
                 v2f o;
                 o.vertex = UnityObjectToClipPos(v.vertex);
-                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                o.uv     = TRANSFORM_TEX(v.uv, _MainTex);
                 return o;
             }
 
diff --git a/Assets/10_AlphaTest/AlphaTest.shader b/Assets/10_AlphaTest/AlphaTest.shader
@@ -3,8 +3,8 @@
     Properties
     {
         [NoScaleOffset]
-        _MainTex ("Texture", 2D) = "white" {}
-        _Color ("Color", Color) = (1, 1, 1, 1)
+        _MainTex("Texture", 2D)    = "white" {}
+        _Color  ("Color",   Color) = (1, 1, 1, 1)
     }
     SubShader
     {
@@ -38,7 +38,7 @@
             };
 
             sampler2D _MainTex;
-            fixed4 _Color;
+            fixed4    _Color;
 
             v2f vert (appdata v)
             {
diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log
@@ -44,3 +44,11 @@ Update Mode: updateDependencies
 
 The following packages were added:
   com.unity.ide.visualstudio@2.0.2
+
+=== Mon Jan  4 10:49:41 2021
+
+Packages were changed.
+Update Mode: updateDependencies
+
+The following packages were updated:
+  com.unity.ide.visualstudio from version 2.0.2 to 2.0.5
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.unity.ide.visualstudio": "2.0.2",
+    "com.unity.ide.visualstudio": "2.0.5",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.unity.ide.visualstudio": {
-      "version": "2.0.2",
+      "version": "2.0.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.1.6f1
-m_EditorVersionWithRevision: 2020.1.6f1 (fc477ca6df10)
+m_EditorVersion: 2020.2.1f1
+m_EditorVersionWithRevision: 2020.2.1f1 (270dd8c3da1c)
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 このリポジトリは資料「[Unity Shader Programming Vol.01](https://xjine.booth.pm/items/931290)」用のリポジトリです。
 
 この資料は有料にて提供されることがありますが、サンプルとなるリソースをオープンソースとして公開していることをご了承ください。
-学習資料として提供する上でもっとも適切な形と判断していますし、維持管理にかかるコストを集合知によって回避する目的があります。
+学習資料として提供する上でもっとも適切な形であり、維持管理にかかるコストを集合知によって回避する目的があります。
 あるいは、購入前のサンプルとしての役割のためでもあります。
 
-継続的な更新のため、ブランチ名と資料のバージョンが一致するように管理するようにしています。
+資料のバージョンとリリースバージョンが一致するように管理しています。

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`{`
`7`	`7`	`CGPROGRAM`
`8`	`8`
`9`		`- #pragma vertex vert`
	`9`	`+ #pragma vertex vert`
`10`	`10`	`#pragma fragment frag`
`11`	`11`
`12`	`12`	`#include "UnityCG.cginc"`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`{`
`12`	`12`	`CGPROGRAM`
`13`	`13`
`14`		`- #pragma vertex vert`
	`14`	`+ #pragma vertex vert`
`15`	`15`	`#pragma fragment frag`
`16`	`16`
`17`	`17`	`#include "UnityCG.cginc"`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`{`
`16`	`16`	`CGPROGRAM`
`17`	`17`
`18`		`- #pragma vertex vert`
	`18`	`+ #pragma vertex vert`
`19`	`19`	`#pragma fragment frag`
`20`	`20`
`21`	`21`	`#include "UnityCG.cginc"`
Original file line number	Diff line number	Diff line change
`@@ -11,21 +11,21 @@`
`11`	`11`	`{`
`12`	`12`	`CGPROGRAM`
`13`	`13`
`14`		`- #pragma vertex vert`
	`14`	`+ #pragma vertex vert`
`15`	`15`	`#pragma fragment frag`
`16`	`16`
`17`	`17`	`#include "UnityCG.cginc"`
`18`	`18`
`19`	`19`	`struct appdata`
`20`	`20`	`{`
`21`	`21`	`float4 vertex : POSITION;`
`22`		`- float2 uv : TEXCOORD;`
	`22`	`+ float2 uv : TEXCOORD;`
`23`	`23`	`};`
`24`	`24`
`25`	`25`	`struct v2f`
`26`	`26`	`{`
`27`	`27`	`float4 vertex : SV_POSITION;`
`28`		`- float2 uv : TEXCOORD;`
	`28`	`+ float2 uv : TEXCOORD;`
`29`	`29`	`};`
`30`	`30`
`31`	`31`	`sampler2D _MainTex;`
`@@ -34,7 +34,7 @@`
`34`	`34`	`{`
`35`	`35`	`v2f o;`
`36`	`36`	`o.vertex = UnityObjectToClipPos(v.vertex);`
`37`		`- o.uv = v.uv;`
	`37`	`+ o.uv = v.uv;`
`38`	`38`	`return o;`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -11,25 +11,25 @@`
`11`	`11`	`{`
`12`	`12`	`CGPROGRAM`
`13`	`13`
`14`		`- #pragma vertex vert`
	`14`	`+ #pragma vertex vert`
`15`	`15`	`#pragma fragment frag`
`16`	`16`
`17`	`17`	`#include "UnityCG.cginc"`
`18`	`18`
`19`	`19`	`struct appdata`
`20`	`20`	`{`
`21`	`21`	`float4 vertex : POSITION;`
`22`		`- float2 uv : TEXCOORD;`
	`22`	`+ float2 uv : TEXCOORD;`
`23`	`23`	`};`
`24`	`24`
`25`	`25`	`struct v2f`
`26`	`26`	`{`
`27`	`27`	`float4 vertex : SV_POSITION;`
`28`		`- float2 uv : TEXCOORD;`
	`28`	`+ float2 uv : TEXCOORD;`
`29`	`29`	`};`
`30`	`30`
`31`	`31`	`sampler2D _MainTex;`
`32`		`- float4 _MainTex_ST;`
	`32`	`+ float4 _MainTex_ST;`
`33`	`33`
`34`	`34`	`v2f vert(appdata v)`
`35`	`35`	`{`
`@@ -41,7 +41,8 @@`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`o.vertex = UnityObjectToClipPos(v.vertex);`
`44`		`- o.uv = TRANSFORM_TEX(v.uv, _MainTex);`
	`44`	`+ o.uv = TRANSFORM_TEX(v.uv, _MainTex);`
	`45`	`+`
`45`	`46`	`return o;`
`46`	`47`	`}`
`47`	`48`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`{`
`14`	`14`	`CGPROGRAM`
`15`	`15`
`16`		`- #pragma vertex vert`
	`16`	`+ #pragma vertex vert`
`17`	`17`	`#pragma fragment frag`
`18`	`18`
`19`	`19`	`#include "UnityCG.cginc"`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,14 @@`
`7`	`7`
`8`	`8`	`SubShader`
`9`	`9`	`{`
`10`		`- ZTest LEqual`
	`10`	`+ ZTest LEqual`
`11`	`11`	`Offset -1, -1`
`12`	`12`
`13`	`13`	`Pass`
`14`	`14`	`{`
`15`	`15`	`CGPROGRAM`
`16`	`16`
`17`		`- #pragma vertex vert`
	`17`	`+ #pragma vertex vert`
`18`	`18`	`#pragma fragment frag`
`19`	`19`
`20`	`20`	`#include "UnityCG.cginc"`