Tweaked boat physics, shaved off half a ms per boat

6 年前 · 23a48921
--- a/Assets/LightweightAsset.asset
+++ b/Assets/LightweightAsset.asset
  m_RequireDepthTexture: 0
  m_RequireSoftParticles: 0
  m_SupportsHDR: 0
-  m_MSAA: 4
+  m_MSAA: 1
-  m_ShadowAtlasResolution: 2048
+  m_ShadowAtlasResolution: 1024
  m_ShadowNearPlaneOffset: 2
  m_ShadowDistance: 350
  m_ShadowCascades: 0
--- a/Assets/Objects/boats/Temp/Prefabs/_Boat.prefab
+++ b/Assets/Objects/boats/Temp/Prefabs/_Boat.prefab
    startSize:
      serializedVersion: 2
      minMaxState: 0
-      scalar: 8
+      scalar: 12
      minScalar: 1
      maxCurve:
        serializedVersion: 2
    rateOverTime:
      serializedVersion: 2
      minMaxState: 0
-      scalar: 1
+      scalar: 0.5
      minScalar: 10
      maxCurve:
        serializedVersion: 2
    rateOverDistance:
      serializedVersion: 2
      minMaxState: 0
-      scalar: 3
+      scalar: 0.5
      minScalar: 0
      maxCurve:
        serializedVersion: 2
      maxColor: {r: 1, g: 1, b: 1, a: 1}
      maxGradient:
        serializedVersion: 2
-        key0: {r: 1, g: 1, b: 1, a: 1}
-        key1: {r: 1, g: 1, b: 1, a: 0.6784314}
-        key2: {r: 0, g: 0, b: 0, a: 0.30588236}
-        key3: {r: 0, g: 0, b: 0, a: 0}
+        key0: {r: 1, g: 1, b: 1, a: 0}
+        key1: {r: 1, g: 1, b: 1, a: 1}
+        key2: {r: 0, g: 0, b: 0, a: 0.6784314}
+        key3: {r: 0, g: 0, b: 0, a: 0.30588236}
        key4: {r: 0, g: 0, b: 0, a: 0}
        key5: {r: 0, g: 0, b: 0, a: 0}
        key6: {r: 0, g: 0, b: 0, a: 0}
        ctime6: 0
        ctime7: 0
        atime0: 0
-        atime1: 1542
-        atime2: 6361
-        atime3: 65535
-        atime4: 0
+        atime1: 910
+        atime2: 2817
+        atime3: 6361
+        atime4: 65535
-        m_NumAlphaKeys: 4
+        m_NumAlphaKeys: 5
      minGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
    startSize:
      serializedVersion: 2
      minMaxState: 0
-      scalar: 8
+      scalar: 12
      minScalar: 1
      maxCurve:
        serializedVersion: 2
    rateOverTime:
      serializedVersion: 2
      minMaxState: 0
-      scalar: 1
+      scalar: 0.5
      minScalar: 10
      maxCurve:
        serializedVersion: 2
    rateOverDistance:
      serializedVersion: 2
      minMaxState: 0
-      scalar: 3
+      scalar: 0.5
      minScalar: 0
      maxCurve:
        serializedVersion: 2
      maxColor: {r: 1, g: 1, b: 1, a: 1}
      maxGradient:
        serializedVersion: 2
-        key0: {r: 1, g: 1, b: 1, a: 1}
-        key1: {r: 1, g: 1, b: 1, a: 0.6784314}
-        key2: {r: 0, g: 0, b: 0, a: 0.30588236}
-        key3: {r: 0, g: 0, b: 0, a: 0}
+        key0: {r: 1, g: 1, b: 1, a: 0}
+        key1: {r: 1, g: 1, b: 1, a: 1}
+        key2: {r: 0, g: 0, b: 0, a: 0.6784314}
+        key3: {r: 0, g: 0, b: 0, a: 0.30588236}
        key4: {r: 0, g: 0, b: 0, a: 0}
        key5: {r: 0, g: 0, b: 0, a: 0}
        key6: {r: 0, g: 0, b: 0, a: 0}
        ctime6: 0
        ctime7: 0
        atime0: 0
-        atime1: 1542
-        atime2: 6361
-        atime3: 65535
-        atime4: 0
+        atime1: 910
+        atime2: 2817
+        atime3: 6361
+        atime4: 65535
-        m_NumAlphaKeys: 4
+        m_NumAlphaKeys: 5
      minGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
--- a/Assets/Objects/props/houses/Prefabs/House01.prefab
+++ b/Assets/Objects/props/houses/Prefabs/House01.prefab
  - component: {fileID: 4656579744416828}
  - component: {fileID: 33639751461412000}
  - component: {fileID: 23416999307703518}
+  - component: {fileID: 65147786760268424}
  m_Layer: 0
  m_Name: House01
  m_TagString: Untagged
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1750764992888742}
  m_Mesh: {fileID: 4300010, guid: 7c7696c943ff57c4aac0e0bb9f82b3c2, type: 3}
+--- !u!65 &65147786760268424
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1750764992888742}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 5.3169765, y: 3.715132, z: 4.8178186}
+  m_Center: {x: -0.5114795, y: 0.7921537, z: -0.47078598}
--- a/Assets/Objects/props/houses/Prefabs/House02.prefab
+++ b/Assets/Objects/props/houses/Prefabs/House02.prefab
  - component: {fileID: 4933349709312262}
  - component: {fileID: 33147715262670324}
  - component: {fileID: 23702019685331466}
+  - component: {fileID: 65956331300609782}
  m_Layer: 0
  m_Name: House02
  m_TagString: Untagged
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1429428162184290}
  m_Mesh: {fileID: 4300008, guid: 7c7696c943ff57c4aac0e0bb9f82b3c2, type: 3}
+--- !u!65 &65956331300609782
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1429428162184290}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 8.438929, y: 2.5816169, z: 7.649478}
+  m_Center: {x: -0.6386714, y: 0.24104118, z: 6.3877883}
--- a/Assets/Objects/props/houses/Prefabs/House03.prefab
+++ b/Assets/Objects/props/houses/Prefabs/House03.prefab
  - component: {fileID: 4856872047518046}
  - component: {fileID: 33456755464596008}
  - component: {fileID: 23581189023478016}
+  - component: {fileID: 65407726638535108}
  m_Layer: 0
  m_Name: House03
  m_TagString: Untagged
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1013499966448624}
  m_Mesh: {fileID: 4300006, guid: 7c7696c943ff57c4aac0e0bb9f82b3c2, type: 3}
+--- !u!65 &65407726638535108
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1013499966448624}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 5.8558702, y: 2.7857983, z: 5.320915}
+  m_Center: {x: -0.40472937, y: 0.33791363, z: 13.357986}
--- a/Assets/Objects/props/houses/Prefabs/House04.prefab
+++ b/Assets/Objects/props/houses/Prefabs/House04.prefab
  - component: {fileID: 4252279632055026}
  - component: {fileID: 33241592930497524}
  - component: {fileID: 23619876895062810}
+  - component: {fileID: 65607526345051590}
  m_Layer: 0
  m_Name: House04
  m_TagString: Untagged
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1091104221591282}
  m_Mesh: {fileID: 4300004, guid: 7c7696c943ff57c4aac0e0bb9f82b3c2, type: 3}
+--- !u!65 &65607526345051590
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1091104221591282}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 6.021473, y: 3.4529974, z: 4.020878}
+  m_Center: {x: -0.5133729, y: 0.5926758, z: 18.851772}
--- a/Assets/Objects/props/houses/Prefabs/House05.prefab
+++ b/Assets/Objects/props/houses/Prefabs/House05.prefab
  - component: {fileID: 4517467000177320}
  - component: {fileID: 33169186937131558}
  - component: {fileID: 23503597795257916}
+  - component: {fileID: 65081846905683348}
  m_Layer: 0
  m_Name: House05
  m_TagString: Untagged
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1229474891580490}
-  m_LocalRotation: {x: -0, y: 0.52748936, z: -0, w: 0.8495617}
-  m_LocalPosition: {x: -2, y: 5.2, z: -38.4}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -9.95, y: 0.92, z: -9.3}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1229474891580490}
  m_Mesh: {fileID: 4300002, guid: 7c7696c943ff57c4aac0e0bb9f82b3c2, type: 3}
+--- !u!65 &65081846905683348
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1229474891580490}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 8.865782, y: 3.0447254, z: 3.6899261}
+  m_Center: {x: -1.23983, y: 0.4771173, z: 24.939562}
--- a/Assets/Objects/props/houses/Prefabs/JettyLong01.prefab
+++ b/Assets/Objects/props/houses/Prefabs/JettyLong01.prefab
  - component: {fileID: 4407848929593064}
  - component: {fileID: 33686245308441112}
  - component: {fileID: 23839206085620050}
+  - component: {fileID: 65309782851261018}
  m_Layer: 0
  m_Name: JettyLong01
  m_TagString: Untagged
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1579226770011358}
  m_Mesh: {fileID: 4300012, guid: 7c7696c943ff57c4aac0e0bb9f82b3c2, type: 3}
+--- !u!65 &65309782851261018
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1579226770011358}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1.8402054, y: 5.667063, z: 4.3814297}
+  m_Center: {x: -0.21704519, y: -3.2514684, z: -5.0636125}
--- a/Assets/Objects/props/houses/Prefabs/JettySqr01.prefab
+++ b/Assets/Objects/props/houses/Prefabs/JettySqr01.prefab
  - component: {fileID: 4759700577955508}
  - component: {fileID: 33571288569362728}
  - component: {fileID: 23036400767905684}
+  - component: {fileID: 65062530547389722}
  m_Layer: 0
  m_Name: JettySqr01
  m_TagString: Untagged
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1178623679222630}
  m_Mesh: {fileID: 4300014, guid: 7c7696c943ff57c4aac0e0bb9f82b3c2, type: 3}
+--- !u!65 &65062530547389722
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1178623679222630}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 5.123723, y: 5.904331, z: 5.133089}
+  m_Center: {x: -0.6407517, y: -3.8328342, z: -12.342929}
--- a/Assets/Scripts/Boat/OnlineTut/BoatPhysics.cs
+++ b/Assets/Scripts/Boat/OnlineTut/BoatPhysics.cs

        void FixedUpdate()
        {
+            Profiler.BeginSample("AddUnderwaterForces");
+            //boatRB.drag = 0.25f;
+            //Add forces to the part of the boat that's below the water
+            if (modifyBoatMesh.underWaterTriangleData.Count > 0)
+            {
+                AddUnderWaterForces();
+            }
+            Profiler.EndSample();
+        }
+
+        void Update()
+        {
            Profiler.BeginSample("GenerateUnderwaterMesh");
 			//Generate the under water mesh
            modifyBoatMesh.GenerateUnderwaterMesh();
 			if(debugMesh)
            	modifyBoatMesh.DisplayMesh(underWaterMesh, "UnderWater Mesh", modifyBoatMesh.underWaterTriangleData);
-
-            Profiler.BeginSample("AddUnderwaterForces");
-            //boatRB.drag = 0.25f;
-            //Add forces to the part of the boat that's below the water
-            if (modifyBoatMesh.underWaterTriangleData.Count > 0)
-            {
-                AddUnderWaterForces();
-            }
-            Profiler.EndSample();
        }

        //Add all forces that act on the squares below the water
--- a/Assets/Scripts/Boat/OnlineTut/ModifyBoatMesh.cs
+++ b/Assets/Scripts/Boat/OnlineTut/ModifyBoatMesh.cs
 using UnityEngine;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using WaterSystem;
        public List<TriangleData> underWaterTriangleData = new List<TriangleData>();

        //List that will store the data we need to sort the vertices based on distance to water
-        List<VertexData> vertexData = new List<VertexData>(3);
+        VertexData[] vertexData = new VertexData[3];

        public ModifyBoatMesh(GameObject boatObj, Mesh mesh)
        {
            //Find all the distances to water once because some triangles share vertices, so reuse
            allDistancesToWater = new float[boatVertices.Length];

-            vertexData.Add(new VertexData());
-            vertexData.Add(new VertexData());
-            vertexData.Add(new VertexData());
+            vertexData[0] = new VertexData();
+            vertexData[1] = new VertexData();
+            vertexData[2] = new VertexData();
        }

        //Generate the underwater mesh
                boatVerticesGlobal[j] = globalPos;
                if(j%2==0)
                {
-                Profiler.BeginSample("GetWaterHeight");
-                allDistancesToWater[j] = -Water.Instance.GetWaterHeight(globalPos);
-                Profiler.EndSample();
+                    allDistancesToWater[j] = -Water.Instance.GetWaterHeight(globalPos);
-            }
+            }//Water.Instance.GetWaterHeights(new Vector3[]{Vector3.zero, Vector3.zero});

            //Add the triangles that are below the water
            Profiler.BeginSample("AddTriangles");
        {
            //Loop through all the triangles (3 vertices at a time = 1 triangle)
            int i = 0;
-            while (i < boatTriangles.Length)
+            while(i < boatTriangles.Length)
+                int countAboveWater = 3;
                //Loop through the 3 vertices
                for (int x = 0; x < 3; x++)
                {
+                    if(vertexData[x].distance < 0f)
+                        countAboveWater--;
+
-
-
-                //All vertices are above the water
-                if (vertexData[0].distance > 0f && vertexData[1].distance > 0f && vertexData[2].distance > 0f)
+                // if(countAboveWater < 2)
+                // {
+                //     Vector3 p1 = vertexData[0].globalVertexPos;
+                //     Vector3 p2 = vertexData[1].globalVertexPos;
+                //     Vector3 p3 = vertexData[2].globalVertexPos;
+                //     //Save the triangle
+                //     underWaterTriangleData.Add(new TriangleData(p1, p2, p3));
+                // }
+                // else
+                // {
+                //     break;
+                // }
+                //Debug.Log(countAboveWater);
+                switch(countAboveWater)
-                    continue;
-                }
-
-
-                //Create the triangles that are below the waterline
-
-                //All vertices are underwater
-                if (vertexData[0].distance < 0f && vertexData[1].distance < 0f && vertexData[2].distance < 0f)
-                {
-                    Vector3 p1 = vertexData[0].globalVertexPos;
-                    Vector3 p2 = vertexData[1].globalVertexPos;
-                    Vector3 p3 = vertexData[2].globalVertexPos;
-
-                    //Save the triangle
-                    underWaterTriangleData.Add(new TriangleData(p1, p2, p3));
-                }
-                //1 or 2 vertices are below the water
-                else
-                {
-                    //Sort the vertices
-                    vertexData.Sort((x, y) => x.distance.CompareTo(y.distance));
-
-                    vertexData.Reverse();
-
-                    //One vertice is above the water, the rest is below
-                    if (vertexData[0].distance > 0f && vertexData[1].distance < 0f && vertexData[2].distance < 0f)
+                    case 3:
+                    break;
+                    case 0:
+                    {
+                        Vector3 p1 = vertexData[0].globalVertexPos;
+                        Vector3 p2 = vertexData[1].globalVertexPos;
+                        Vector3 p3 = vertexData[2].globalVertexPos;
+                        Vector3 d = new Vector3(vertexData[0].distance, vertexData[1].distance, vertexData[2].distance);
+                        //Save the triangle
+                        underWaterTriangleData.Add(new TriangleData(p1, p2, p3, d, true));
+                    }
+                    break;
+                    case 1:
+                        Array.Sort(vertexData, delegate(VertexData v1, VertexData v2){return v2.distance.CompareTo(v1.distance);});
-                    //Two vertices are above the water, the other is below
-                    else if (vertexData[0].distance > 0f && vertexData[1].distance > 0f && vertexData[2].distance < 0f)
+                    break;
+                    case 2:
+                        Array.Sort(vertexData, delegate(VertexData v1, VertexData v2){return v2.distance.CompareTo(v1.distance);});
+                    break;
                }
            }
        }

            Vector3 I_L = LI_L + L;

-
-            underWaterTriangleData.Add(new TriangleData(M, I_M, I_L));
-            underWaterTriangleData.Add(new TriangleData(M, I_L, L));
+            underWaterTriangleData.Add(new TriangleData(M, I_M, I_L, Vector3.zero, false));
+            underWaterTriangleData.Add(new TriangleData(M, I_L, L, Vector3.zero, false));
        }

        //Build the new triangles where two of the old vertices are above the water

            //Save the data, such as normal, area, etc
            //1 triangle below the water
-            underWaterTriangleData.Add(new TriangleData(L, J_H, J_M));
+            underWaterTriangleData.Add(new TriangleData(L, J_H, J_M, Vector3.zero, false));
        }

        //Help class to store triangle data so we can sort the distances
        //The area of the triangle
        public float area;

-        public TriangleData(Vector3 p1, Vector3 p2, Vector3 p3)
+        public TriangleData(Vector3 p1, Vector3 p2, Vector3 p3, Vector3 distances, bool full)
        {
            this.p1 = p1;
            this.p2 = p2;
            this.center = (p1 + p2 + p3) / 3f;

-            //Distance to the surface from the center of the triangle
-            this.distanceToSurface = Mathf.Abs(Water.Instance.GetWaterHeight(this.center));
+            //Distance to the surface from the center of the triangle, we average it if triangle uncut
+            if(full)
+                this.distanceToSurface = Mathf.Abs((distances.x + distances.y + distances.z) / 3f);
+            else
+                this.distanceToSurface = Mathf.Abs(Water.Instance.GetWaterHeight(this.center));

            //Normal to the triangle
            this.normal = Vector3.Cross(p2 - p1, p3 - p1).normalized;
--- a/Assets/Shaders/LWDitheredVegetation.ShaderGraph.meta
+++ b/Assets/Shaders/LWDitheredVegetation.ShaderGraph.meta
 fileFormatVersion: 2
 guid: b614448952ccc5649bd45c3dd2e53744
 ScriptedImporter:
-  fileIDToRecycleName:
-    4800000: MainAsset
-  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Shaders/PackedPBR.ShaderGraph.meta
+++ b/Assets/Shaders/PackedPBR.ShaderGraph.meta
 fileFormatVersion: 2
 guid: 7cd247c7cbda54323b0e395ea419af3d
 ScriptedImporter:
-  fileIDToRecycleName:
-    4800000: MainAsset
-  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/TangentIssue/TangentIssue.ShaderGraph.meta
+++ b/Assets/TangentIssue/TangentIssue.ShaderGraph.meta
 fileFormatVersion: 2
 guid: 99a637fd603e948798dcf70ddfbbb7c7
 ScriptedImporter:
-  fileIDToRecycleName:
-    4800000: MainAsset
-  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Textures/_waterFoam.mat
+++ b/Assets/Textures/_waterFoam.mat
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: _waterFoam
-  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: _ALPHABLEND_ON
  m_LightmapFlags: 0
  m_EnableInstancingVariants: 0
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: d0af25a908ddeb24c927ff33f57876e8, type: 3}
+        m_Texture: {fileID: 2800000, guid: e86fc14b3ceae422f879f3c82be5297a, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
--- a/Assets/scenes/Island.unity
+++ b/Assets/scenes/Island.unity
  m_Father: {fileID: 135617337}
  m_RootOrder: 24
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!28 &126700473
+Texture2D:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  serializedVersion: 2
+  m_Width: 128
+  m_Height: 2
+  m_CompleteImageSize: 1024
+  m_TextureFormat: 5
+  m_MipCount: 1
+  m_IsReadable: 1
+  m_AlphaIsTransparency: 0
+  m_ImageCount: 1
+  m_TextureDimension: 2
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 1
+    m_WrapV: 1
+    m_WrapW: 1
+  m_LightmapFormat: 0
+  m_ColorSpace: 1
+  image data: 1024
+  _typelessdata: ffbcb696ffa3b08eff8aa987ff7ea685ff7aa587ff75a488ff70a48aff6ca38bff67a38dff62a28eff5ea18fff59a191ff55a092ff50a094ff4b9f95ff479f97ff429e98ff3d9d99ff399d9bff359c9cff349b9bff339b9aff329a9aff319999ff2f9898ff2e9898ff2d9797ff2c9697ff2b9596ff2a9495ff289495ff279394ff269294ff259193ff249192ff229092ff218f91ff208e91ff1f8e90ff1e8d8fff1c8c8fff1b8b8eff1a8b8dff198a8dff18898cff17888cff15888bff14878aff13868aff128589ff118489ff0f8488ff0e8387ff0d8287ff0c8186ff0b8186ff098085ff087f84ff077e84ff067e83ff057d82ff047c82ff027b81ff017b81ff007a80ff007980ff00787fff00777fff00767eff00757eff00747eff00747dff00737dff00727dff00717cff00707cff006f7bff006e7bff006d7bff006c7aff006b7aff006b79ff006a79ff006979ff006878ff006778ff006678ff006577ff006477ff006376ff006376ff006276ff006175ff006075ff005f74ff005e74ff005d74ff005c73ff005b73ff005a73ff005a72ff005972ff005871ff005771ff005671ff005570ff005470ff005370ff00526fff00526fff00516eff00506eff004f6eff004e6dff004d6dff004c6cff004b6cff004a6cff00496bff00496bff00486bff00476aff00466aff004569ff004469ff004369ff004268ff004168ff000000ff010201ff030302ff040503ff060604ff070805ff090906ff0a0b07ff0c0c08ff0d0e09ff0f0f0aff10110bff12130cff13140dff15160eff16170fff181910ff191a10ff1b1c11ff1c1d12ff1e1f13ff1f2014ff212215ff222416ff232517ff252718ff262819ff282a1aff292b1bff2b2d1cff2c2e1dff2e301eff2e311fff2e3220ff2e3221ff2e3322ff2e3423ff2e3424ff2e3525ff2e3626ff2e3727ff2e3728ff2e3829ff2e392aff2e3a2bff2e3a2cff2e3b2eff2e3c2fff2e3d30ff2e3d31ff2e3e32ff2e3f33ff2e4034ff2e4035ff2e4136ff2e4237ff2e4338ff2e4339ff2e443aff2e453bff2e453cff2e463dff2e473eff2e483fff2e4840ff2e4941ff2e4a42ff2e4b43ff2e4b44ff2d4c45ff2d4d46ff2d4e47ff2d4e48ff2d4f49ff2d504aff2d514bff2d514cff2d524dff2d534eff2d544fff2d5451ff2d5552ff2d5653ff2d5654ff2d5755ff2d5856ff2d5957ff2d5958ff2d5a59ff2d5b5aff2d5c5bff2d5c5cff2d5d5dff2d5e5eff2d5f5fff2d5f60ff2d6061ff2d6162ff2d6263ff2d6264ff2d6365ff2d6466ff2d6567ff2d6568ff2d6669ff2d676aff2d676bff2d686cff2d696dff2d6a6eff2d6a6fff2d6b70ff2d6c71ff2d6d72ff2d6d73ff2d6e75ff2d6f76ff2d7077ff2d7078ff2d7179ff2d727aff2d737bff2d737cff2d747dff2d757eff2d767fff2d7680ff2d7781
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
 --- !u!1001 &128250068
 Prefab:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 153441711}
-  m_LocalRotation: {x: 0.061684627, y: -0.8048548, z: 0.08499778, w: 0.58410543}
+  m_LocalRotation: {x: 0.06168488, y: -0.8048563, z: 0.08499727, w: 0.58410347}
  m_LocalPosition: {x: -64.48244, y: 7.422699, z: -114.538864}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
      objectReference: {fileID: 0}
    - target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 2}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 114129291822198474, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
        type: 2}
  m_PrefabParentObject: {fileID: 4759700577955508, guid: 851454441f29b4ab9a78308458eafccb,
    type: 2}
  m_PrefabInternal: {fileID: 621579106}
--- !u!28 &628442205
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  serializedVersion: 2
-  m_Width: 128
-  m_Height: 1
-  m_CompleteImageSize: 512
-  m_TextureFormat: 5
-  m_MipCount: 1
-  m_IsReadable: 1
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 1
-    m_WrapV: 1
-    m_WrapW: 1
-  m_LightmapFormat: 0
-  m_ColorSpace: 1
-  image data: 512
-  _typelessdata: ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000018ff000031ff00004bff000064ff00007dff000096ff0000b0ff0000c9ff0000e2ff0000fbff0005fbff000cf7ff0012f3ff0019eeff001feaff0025e5ff002ce1ff0032ddff0038d8ff003fd4ff0045d0ff004ccbff0052c7ff0058c3ff005fbeff0065baff006bb5ff0072b1ff0078adff007ea8ff0085a4ff008ba0ff00929bff009897ff009e93ff00a58eff00ab8aff00b185ff00b881ff00be7dff00c578ff00cb74ff00d170ff00d86bff00de67ff00e463ff00eb5eff00f15aff00f855ff00fe51ff15f54aff2fea42ff49de39ff63d231ff7cc629ff96bb21ffb0af19ffc9a311ffe39809fffd8c01ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!1 &636757617
 GameObject:
  m_ObjectHideFlags: 3
      objectReference: {fileID: 0}
    - target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 2}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 114129291822198474, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
        type: 2}
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1017609894}
-  m_LocalRotation: {x: 0.061684627, y: -0.8048548, z: 0.08499778, w: 0.58410543}
+  m_LocalRotation: {x: 0.06168488, y: -0.8048563, z: 0.08499727, w: 0.58410347}
  m_LocalPosition: {x: -64.48244, y: 7.422699, z: -114.538864}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!28 &1088307719
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  serializedVersion: 2
-  m_Width: 128
-  m_Height: 2
-  m_CompleteImageSize: 1024
-  m_TextureFormat: 5
-  m_MipCount: 1
-  m_IsReadable: 1
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 1
-    m_WrapV: 1
-    m_WrapW: 1
-  m_LightmapFormat: 0
-  m_ColorSpace: 1
-  image data: 1024
-  _typelessdata: ffbcb696ffa3b08eff8aa987ff7ea685ff7aa587ff75a488ff70a48aff6ca38bff67a38dff62a28eff5ea18fff59a191ff55a092ff50a094ff4b9f95ff479f97ff429e98ff3d9d99ff399d9bff359c9cff349b9bff339b9aff329a9aff319999ff2f9898ff2e9898ff2d9797ff2c9697ff2b9596ff2a9495ff289495ff279394ff269294ff259193ff249192ff229092ff218f91ff208e91ff1f8e90ff1e8d8fff1c8c8fff1b8b8eff1a8b8dff198a8dff18898cff17888cff15888bff14878aff13868aff128589ff118489ff0f8488ff0e8387ff0d8287ff0c8186ff0b8186ff098085ff087f84ff077e84ff067e83ff057d82ff047c82ff027b81ff017b81ff007a80ff007980ff00787fff00777fff00767eff00757eff00747eff00747dff00737dff00727dff00717cff00707cff006f7bff006e7bff006d7bff006c7aff006b7aff006b79ff006a79ff006979ff006878ff006778ff006678ff006577ff006477ff006376ff006376ff006276ff006175ff006075ff005f74ff005e74ff005d74ff005c73ff005b73ff005a73ff005a72ff005972ff005871ff005771ff005671ff005570ff005470ff005370ff00526fff00526fff00516eff00506eff004f6eff004e6dff004d6dff004c6cff004b6cff004a6cff00496bff00496bff00486bff00476aff00466aff004569ff004469ff004369ff004268ff004168ff000000ff010201ff030302ff040503ff060604ff070805ff090906ff0a0b07ff0c0c08ff0d0e09ff0f0f0aff10110bff12130cff13140dff15160eff16170fff181910ff191a10ff1b1c11ff1c1d12ff1e1f13ff1f2014ff212215ff222416ff232517ff252718ff262819ff282a1aff292b1bff2b2d1cff2c2e1dff2e301eff2e311fff2e3220ff2e3221ff2e3322ff2e3423ff2e3424ff2e3525ff2e3626ff2e3727ff2e3728ff2e3829ff2e392aff2e3a2bff2e3a2cff2e3b2eff2e3c2fff2e3d30ff2e3d31ff2e3e32ff2e3f33ff2e4034ff2e4035ff2e4136ff2e4237ff2e4338ff2e4339ff2e443aff2e453bff2e453cff2e463dff2e473eff2e483fff2e4840ff2e4941ff2e4a42ff2e4b43ff2e4b44ff2d4c45ff2d4d46ff2d4e47ff2d4e48ff2d4f49ff2d504aff2d514bff2d514cff2d524dff2d534eff2d544fff2d5451ff2d5552ff2d5653ff2d5654ff2d5755ff2d5856ff2d5957ff2d5958ff2d5a59ff2d5b5aff2d5c5bff2d5c5cff2d5d5dff2d5e5eff2d5f5fff2d5f60ff2d6061ff2d6162ff2d6263ff2d6264ff2d6365ff2d6466ff2d6567ff2d6568ff2d6669ff2d676aff2d676bff2d686cff2d696dff2d6a6eff2d6a6fff2d6b70ff2d6c71ff2d6d72ff2d6d73ff2d6e75ff2d6f76ff2d7077ff2d7078ff2d7179ff2d727aff2d737bff2d737cff2d747dff2d757eff2d767fff2d7680ff2d7781
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!1001 &1091694753
 Prefab:
  m_ObjectHideFlags: 0
      objectReference: {fileID: 0}
    - target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 2}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 114129291822198474, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
        type: 2}
  m_PrefabParentObject: {fileID: 4036952117179152, guid: b92151ed482ed45ef84412410142f938,
    type: 2}
  m_PrefabInternal: {fileID: 1287051420}
--- !u!28 &1113805500
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  serializedVersion: 2
-  m_Width: 128
-  m_Height: 2
-  m_CompleteImageSize: 1024
-  m_TextureFormat: 5
-  m_MipCount: 1
-  m_IsReadable: 1
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 1
-    m_WrapV: 1
-    m_WrapW: 1
-  m_LightmapFormat: 0
-  m_ColorSpace: 1
-  image data: 1024
-  _typelessdata: ffbcb696ffa3b08eff8aa987ff7ea685ff7aa587ff75a488ff70a48aff6ca38bff67a38dff62a28eff5ea18fff59a191ff55a092ff50a094ff4b9f95ff479f97ff429e98ff3d9d99ff399d9bff359c9cff349b9bff339b9aff329a9aff319999ff2f9898ff2e9898ff2d9797ff2c9697ff2b9596ff2a9495ff289495ff279394ff269294ff259193ff249192ff229092ff218f91ff208e91ff1f8e90ff1e8d8fff1c8c8fff1b8b8eff1a8b8dff198a8dff18898cff17888cff15888bff14878aff13868aff128589ff118489ff0f8488ff0e8387ff0d8287ff0c8186ff0b8186ff098085ff087f84ff077e84ff067e83ff057d82ff047c82ff027b81ff017b81ff007a80ff007980ff00787fff00777fff00767eff00757eff00747eff00747dff00737dff00727dff00717cff00707cff006f7bff006e7bff006d7bff006c7aff006b7aff006b79ff006a79ff006979ff006878ff006778ff006678ff006577ff006477ff006376ff006376ff006276ff006175ff006075ff005f74ff005e74ff005d74ff005c73ff005b73ff005a73ff005a72ff005972ff005871ff005771ff005671ff005570ff005470ff005370ff00526fff00526fff00516eff00506eff004f6eff004e6dff004d6dff004c6cff004b6cff004a6cff00496bff00496bff00486bff00476aff00466aff004569ff004469ff004369ff004268ff004168ff000000ff010201ff030302ff040503ff060604ff070805ff090906ff0a0b07ff0c0c08ff0d0e09ff0f0f0aff10110bff12130cff13140dff15160eff16170fff181910ff191a10ff1b1c11ff1c1d12ff1e1f13ff1f2014ff212215ff222416ff232517ff252718ff262819ff282a1aff292b1bff2b2d1cff2c2e1dff2e301eff2e311fff2e3220ff2e3221ff2e3322ff2e3423ff2e3424ff2e3525ff2e3626ff2e3727ff2e3728ff2e3829ff2e392aff2e3a2bff2e3a2cff2e3b2eff2e3c2fff2e3d30ff2e3d31ff2e3e32ff2e3f33ff2e4034ff2e4035ff2e4136ff2e4237ff2e4338ff2e4339ff2e443aff2e453bff2e453cff2e463dff2e473eff2e483fff2e4840ff2e4941ff2e4a42ff2e4b43ff2e4b44ff2d4c45ff2d4d46ff2d4e47ff2d4e48ff2d4f49ff2d504aff2d514bff2d514cff2d524dff2d534eff2d544fff2d5451ff2d5552ff2d5653ff2d5654ff2d5755ff2d5856ff2d5957ff2d5958ff2d5a59ff2d5b5aff2d5c5bff2d5c5cff2d5d5dff2d5e5eff2d5f5fff2d5f60ff2d6061ff2d6162ff2d6263ff2d6264ff2d6365ff2d6466ff2d6567ff2d6568ff2d6669ff2d676aff2d676bff2d686cff2d696dff2d6a6eff2d6a6fff2d6b70ff2d6c71ff2d6d72ff2d6d73ff2d6e75ff2d6f76ff2d7077ff2d7078ff2d7179ff2d727aff2d737bff2d737cff2d747dff2d757eff2d767fff2d7680ff2d7781
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!1001 &1116068033
 Prefab:
  m_ObjectHideFlags: 0
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: b92151ed482ed45ef84412410142f938, type: 2}
  m_IsPrefabParent: 0
--- !u!28 &1699263556
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  serializedVersion: 2
-  m_Width: 128
-  m_Height: 1
-  m_CompleteImageSize: 512
-  m_TextureFormat: 5
-  m_MipCount: 1
-  m_IsReadable: 1
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 1
-    m_WrapV: 1
-    m_WrapW: 1
-  m_LightmapFormat: 0
-  m_ColorSpace: 1
-  image data: 512
-  _typelessdata: ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000018ff000031ff00004bff000064ff00007dff000096ff0000b0ff0000c9ff0000e2ff0000fbff0005fbff000cf7ff0012f3ff0019eeff001feaff0025e5ff002ce1ff0032ddff0038d8ff003fd4ff0045d0ff004ccbff0052c7ff0058c3ff005fbeff0065baff006bb5ff0072b1ff0078adff007ea8ff0085a4ff008ba0ff00929bff009897ff009e93ff00a58eff00ab8aff00b185ff00b881ff00be7dff00c578ff00cb74ff00d170ff00d86bff00de67ff00e463ff00eb5eff00f15aff00f855ff00fe51ff15f54aff2fea42ff49de39ff63d231ff7cc629ff96bb21ffb0af19ffc9a311ffe39809fffd8c01ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!1001 &1700273966
 Prefab:
  m_ObjectHideFlags: 0
        type: 2}
      propertyPath: _colorRamp
      value: 
-      objectReference: {fileID: 1088307719}
+      objectReference: {fileID: 126700473}
    - target: {fileID: 114084614423911968, guid: 2cac2e60f3f6f2447ad9b550450f60ed,
        type: 2}
      propertyPath: m_TextureSize
        type: 2}
      propertyPath: _foamRamp
      value: 
-      objectReference: {fileID: 1699263556}
+      objectReference: {fileID: 1991615157}
    - target: {fileID: 114943683913522278, guid: 2cac2e60f3f6f2447ad9b550450f60ed,
        type: 2}
      propertyPath: _foamRampRaw.key0.r
    - target: {fileID: 114943683913522278, guid: 2cac2e60f3f6f2447ad9b550450f60ed,
        type: 2}
      propertyPath: _foamRampRaw.ctime3
-      value: 50216
+      value: 59945
      objectReference: {fileID: 0}
    - target: {fileID: 114943683913522278, guid: 2cac2e60f3f6f2447ad9b550450f60ed,
        type: 2}
      propertyPath: m_IsActive
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 114943683913522278, guid: 2cac2e60f3f6f2447ad9b550450f60ed,
+        type: 2}
+      propertyPath: sampleHeightCompute
+      value: 
+      objectReference: {fileID: 7200000, guid: efe1c759474a54492b19020f76d49041, type: 3}
    m_RemovedComponents:
    - {fileID: 23417954490615130, guid: 2cac2e60f3f6f2447ad9b550450f60ed, type: 2}
    - {fileID: 33110715006230082, guid: 2cac2e60f3f6f2447ad9b550450f60ed, type: 2}
  m_Father: {fileID: 1242123165}
  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!28 &1991615157
+Texture2D:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  serializedVersion: 2
+  m_Width: 128
+  m_Height: 1
+  m_CompleteImageSize: 512
+  m_TextureFormat: 5
+  m_MipCount: 1
+  m_IsReadable: 1
+  m_AlphaIsTransparency: 0
+  m_ImageCount: 1
+  m_TextureDimension: 2
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 1
+    m_WrapV: 1
+    m_WrapW: 1
+  m_LightmapFormat: 0
+  m_ColorSpace: 1
+  image data: 512
+  _typelessdata: ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000018ff000031ff00004bff000064ff00007dff000096ff0000b0ff0000c9ff0000e2ff0000fbff0005fbff000cf7ff0012f3ff0019eeff001feaff0025e5ff002ce1ff0032ddff0038d8ff003fd4ff0045d0ff004ccbff0052c7ff0058c3ff005fbeff0065baff006bb5ff0072b1ff0078adff007ea8ff0085a4ff008ba0ff00929bff009897ff009e93ff00a58eff00ab8aff00b185ff00b881ff00be7dff00c578ff00cb74ff00d170ff00d86bff00de67ff00e463ff00eb5eff00f15aff00f855ff00fe51ff07fc4eff10f84bff19f448ff22f046ff2bec43ff33e840ff3ce43dff45e03bff4edc38ff57d835ff60d432ff68d02fff71cc2dff7ac82aff83c327ff8cbf24ff94bb22ff9db71fffa6b31cffafaf19ffb8ab16ffc1a714ffc9a311ffd29f0effdb9b0bffe49709ffed9306fff58f03fffe8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00ffff8b00
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
 --- !u!1001 &1997248646
 Prefab:
  m_ObjectHideFlags: 0
--- a/Assets/scenes/Testing/meshSetups.unity
+++ b/Assets/scenes/Testing/meshSetups.unity
  m_ShowToolkit: 0
  m_ShowCustomSorter: 0
  breakBeforeColorGrading: 0
-  m_BeforeTransparentBundles:
-  - assemblyQualifiedName: ColorGrab, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
+  m_BeforeTransparentBundles: []
  m_BeforeStackBundles: []
  m_AfterStackBundles: []
 --- !u!1001 &1938374589
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Scenes:
-  - enabled: 0
-    path: 
-    guid: 00000000000000000000000000000000
-  - enabled: 0
+  - enabled: 1
    path: Assets/scenes/Island.unity
    guid: e49366a21c3d84388bfb33016c0e77e2
  - enabled: 0
    path: Assets/scenes/Testing/Water.unity
    guid: 3ec7517bb458ebc449f7ad88104046da
-  - enabled: 1
+  - enabled: 0
    path: Assets/scenes/Testing/WaterPerf.unity
    guid: 2537cd0765fecf0439b7d67b03a746e1
  m_configObjects: {}
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
    4: UNITY_POST_PROCESSING_STACK_V2
    7: UNITY_POST_PROCESSING_STACK_V2
    13: UNITY_POST_PROCESSING_STACK_V2
+    14: UNITY_POST_PROCESSING_STACK_V2
    17: UNITY_POST_PROCESSING_STACK_V2
    18: UNITY_POST_PROCESSING_STACK_V2
    19: UNITY_POST_PROCESSING_STACK_V2
  il2cppCompilerConfiguration: {}
  incrementalIl2cppBuild: {}
  additionalIl2CppArgs: 
-  scriptingRuntimeVersion: 0
+  scriptingRuntimeVersion: 1
  apiCompatibilityLevelPerPlatform: {}
  m_RenderingPath: 1
  m_MobileRenderingPath: 1
      daydreamIconBackground: {fileID: 0}
  cloudServicesEnabled: {}
  facebookSdkVersion: 7.9.4
-  apiCompatibilityLevel: 2
+  apiCompatibilityLevel: 3
  cloudProjectId: 
  projectName: 
  organizationId: 
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
-m_EditorVersion: 2018.1.0b8
+m_EditorVersion: 2018.1.0b7
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
    blendWeights: 4
    textureQuality: 0
    anisotropicTextures: 2
-    antiAliasing: 4
+    antiAliasing: 0
    softParticles: 1
    softVegetation: 1
    realtimeReflectionProbes: 1
--- a/Assets/Textures/Water/Dot_Full.png
+++ b/Assets/Textures/Water/Dot_Full.png
--- a/Assets/Textures/Water/Dot_Full.png.meta
+++ b/Assets/Textures/Water/Dot_Full.png.meta
+fileFormatVersion: 2
+guid: e86fc14b3ceae422f879f3c82be5297a
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/WaterSystem.meta
+++ b/Assets/WaterSystem.meta
+fileFormatVersion: 2
+guid: baf515dcbd42342ca97fd8c94d6d0c18
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Textures/Water/Dot.png
+++ b/Assets/Textures/Water/Dot.png
--- a/Assets/Textures/Water/Dot.png.meta
+++ b/Assets/Textures/Water/Dot.png.meta
-fileFormatVersion: 2
-guid: f40bdaf402c6ec44d99f42af17712e72
-TextureImporter:
-  fileIDToRecycleName: {}
-  externalObjects: {}
-  serializedVersion: 5
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -1
-    wrapU: -1
-    wrapV: -1
-    wrapW: -1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spritePixelsToUnits: 100
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - serializedVersion: 2
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: