Update with Unity 2018.2

namkazt · Jul 29, 2018 · 0c56035 · 0c56035
1 parent 92343e2
commit 0c56035
Show file tree

Hide file tree

Showing 12 changed files with 4,047 additions and 979 deletions.
diff --git a/Assets/Kino/Motion/Shader/Common.cginc b/Assets/Kino/Motion/Shader/Common.cginc
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 //
 // Kino/Motion - Motion blur effect
 //
@@ -93,7 +95,7 @@ struct v2f_multitex
 v2f_multitex vert_Multitex(appdata_full v)
 {
     v2f_multitex o;
-    o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+    o.pos = UnityObjectToClipPos(v.vertex);
     o.uv0 = v.texcoord.xy;
     o.uv1 = v.texcoord.xy;
 #if UNITY_UV_STARTS_AT_TOP

diff --git a/Assets/Kino/Obscurance/Obscurance.cs b/Assets/Kino/Obscurance/Obscurance.cs
@@ -120,7 +120,7 @@ public enum OcclusionSource {
         /// and HDR rendering.
         public bool ambientOnly {
             get {
-                return _ambientOnly && targetCamera.hdr &&
+                return _ambientOnly && targetCamera.allowHDR &&
                     occlusionSource == OcclusionSource.GBuffer;
             }
             set { _ambientOnly = value; }

diff --git a/Assets/Kino/Obscurance/Shader/Common.cginc b/Assets/Kino/Obscurance/Shader/Common.cginc
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 // Upgrade NOTE: commented out 'float4x4 _WorldToCamera', a built-in variable
 // Upgrade NOTE: replaced '_WorldToCamera' with 'unity_WorldToCamera'
 
@@ -201,7 +203,7 @@ v2f vert(appdata_img v)
     o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord, _MainTex_ST);
     o.uvAlt = UnityStereoScreenSpaceUVAdjust(uvAlt, _MainTex_ST);
 #else
-    o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+    o.pos = UnityObjectToClipPos(v.vertex);
     o.uv = v.texcoord;
     o.uvAlt = uvAlt;
 #endif

diff --git a/Assets/Kino/Vision/Script/ArrowArray.cs b/Assets/Kino/Vision/Script/ArrowArray.cs
@@ -86,7 +86,7 @@ public void BuildMesh(int columns, int rows)
                 _mesh.SetUVs(0, uvs);
                 _mesh.SetIndices(indices, MeshTopology.Lines, 0);
 
-                _mesh.Optimize();
+                ;
                 _mesh.UploadMeshData(true);
 
                 // update the properties

diff --git a/Assets/Test/Model/MazeLowMan.fbx.meta b/Assets/Test/Model/MazeLowMan.fbx.meta