Updated water submodule

7 年前 · c7c57043
--- a/Assets/scenes/Island.unity
+++ b/Assets/scenes/Island.unity
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 39214996}
  m_Mesh: {fileID: 4300008, guid: fb2f5cec30b474b89b778e3aab6f3dfe, type: 3}
--- !u!28 &41469276
-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: ffbcb696ffa3b08eff8aa987ff7ea685ff7aa587ff75a488ff70a48aff6ca38bff67a38dff62a28eff5ea18fff59a191ff55a092ff50a094ff4b9f95ff479f97ff429e98ff3d9d99ff399d9bff359c9cff349b9bff339b9aff329a9aff319999ff2f9898ff2e9898ff2d9797ff2c9697ff2b9596ff2a9495ff289495ff279394ff269294ff259193ff249192ff229092ff218f91ff208e91ff1f8e90ff1e8d8fff1c8c8fff1b8b8eff1a8b8dff198a8dff18898cff17888cff15888bff14878aff13868aff128589ff118489ff0f8488ff0e8387ff0d8287ff0c8186ff0b8186ff098085ff087f84ff077e84ff067e83ff057d82ff047c82ff027b81ff017b81ff007a80ff007980ff00787fff00777fff00767eff00757eff00747eff00747dff00737dff00727dff00717cff00707cff006f7bff006e7bff006d7bff006c7aff006b7aff006b79ff006a79ff006979ff006878ff006778ff006678ff006577ff006477ff006376ff006376ff006276ff006175ff006075ff005f74ff005e74ff005d74ff005c73ff005b73ff005a73ff005a72ff005972ff005871ff005771ff005671ff005570ff005470ff005370ff00526fff00526fff00516eff00506eff004f6eff004e6dff004d6dff004c6cff004b6cff004a6cff00496bff00496bff00486bff00476aff00466aff004569ff004469ff004369ff004268ff004168ff000000ff010201ff030302ff040503ff060604ff070805ff090906ff0a0b07ff0c0c08ff0d0e09ff0f0f0aff10110bff12130cff13140dff15160eff16170fff181910ff191a11ff1b1c11ff1c1d12ff1e1f13ff1f2114ff212215ff222416ff242517ff252718ff262819ff282a1aff292b1bff2b2d1cff2c2e1dff2e301eff2e311fff2e3220ff2e3221ff2e3322ff2e3423ff2e3424ff2e3525ff2e3626ff2e3727ff2e3728ff2e3829ff2e392aff2e3a2bff2e3a2dff2e3b2eff2e3c2fff2e3d30ff2e3d31ff2e3e32ff2e3f33ff2e4034ff2e4035ff2e4136ff2e4237ff2e4338ff2e4339ff2e443aff2e453bff2e453cff2e463dff2e473eff2e483fff2e4840ff2e4941ff2e4a42ff2e4b43ff2e4b44ff2d4c45ff2d4d46ff2d4e47ff2d4e48ff2d4f49ff2d504aff2d514bff2d514cff2d524dff2d534eff2d544fff2d5451ff2d5552ff2d5653ff2d5654ff2d5755ff2d5856ff2d5957ff2d5958ff2d5a59ff2d5b5aff2d5c5bff2d5c5cff2d5d5dff2d5e5eff2d5f5fff2d5f60ff2d6061ff2d6162ff2d6263ff2d6264ff2d6365ff2d6466ff2d6567ff2d6568ff2d6669ff2d676aff2d676bff2d686cff2d696dff2d6a6eff2d6a6fff2d6b70ff2d6c71ff2d6d72ff2d6d74ff2d6e75ff2d6f76ff2d7077ff2d7078ff2d7179ff2d727aff2d737bff2d737cff2d747dff2d757eff2d767fff2d7680ff2d7781
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!1 &45246106
 GameObject:
  m_ObjectHideFlags: 0
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 112044729}
  m_Mesh: {fileID: 4300002, guid: fb2f5cec30b474b89b778e3aab6f3dfe, type: 3}
+--- !u!28 &112698118
+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: 4
+  m_CompleteImageSize: 2048
+  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: 2048
+  _typelessdata: ffbcb696ffa3b08eff8aa987ff7ea685ff7aa587ff75a488ff70a48aff6ca38bff67a38dff62a28eff5ea18fff59a191ff55a092ff50a094ff4b9f95ff479f97ff429e98ff3d9d99ff399d9bff359c9cff349b9bff339b9aff329a9aff319999ff2f9898ff2e9898ff2d9797ff2c9697ff2b9596ff2a9495ff289495ff279394ff269294ff259193ff249192ff229092ff218f91ff208e91ff1f8e90ff1e8d8fff1c8c8fff1b8b8eff1a8b8dff198a8dff18898cff17888cff15888bff14878aff13868aff128589ff118489ff0f8488ff0e8387ff0d8287ff0c8186ff0b8186ff098085ff087f84ff077e84ff067e83ff057d82ff047c82ff027b81ff017b81ff007a80ff007980ff00787fff00777fff00767eff00757eff00747eff00747dff00737dff00727dff00717cff00707cff006f7bff006e7bff006d7bff006c7aff006b7aff006b79ff006a79ff006979ff006878ff006778ff006678ff006577ff006477ff006376ff006376ff006276ff006175ff006075ff005f74ff005e74ff005d74ff005c73ff005b73ff005a73ff005a72ff005972ff005871ff005771ff005671ff005570ff005470ff005370ff00526fff00526fff00516eff00506eff004f6eff004e6dff004d6dff004c6cff004b6cff004a6cff00496bff00496bff00486bff00476aff00466aff004569ff004469ff004369ff004268ff004168ff000000ff010201ff030302ff040503ff060604ff070805ff090906ff0a0b07ff0c0c08ff0d0e09ff0f0f0aff10110bff12130cff13140dff15160eff16170fff181910ff191a11ff1b1c11ff1c1d12ff1e1f13ff1f2114ff212215ff222416ff242517ff252718ff262819ff282a1aff292b1bff2b2d1cff2c2e1dff2e301eff2e311fff2e3220ff2e3221ff2e3322ff2e3423ff2e3424ff2e3525ff2e3626ff2e3727ff2e3728ff2e3829ff2e392aff2e3a2bff2e3a2dff2e3b2eff2e3c2fff2e3d30ff2e3d31ff2e3e32ff2e3f33ff2e4034ff2e4035ff2e4136ff2e4237ff2e4338ff2e4339ff2e443aff2e453bff2e453cff2e463dff2e473eff2e483fff2e4840ff2e4941ff2e4a42ff2e4b43ff2e4b44ff2d4c45ff2d4d46ff2d4e47ff2d4e48ff2d4f49ff2d504aff2d514bff2d514cff2d524dff2d534eff2d544fff2d5451ff2d5552ff2d5653ff2d5654ff2d5755ff2d5856ff2d5957ff2d5958ff2d5a59ff2d5b5aff2d5c5bff2d5c5cff2d5d5dff2d5e5eff2d5f5fff2d5f60ff2d6061ff2d6162ff2d6263ff2d6264ff2d6365ff2d6466ff2d6567ff2d6568ff2d6669ff2d676aff2d676bff2d686cff2d696dff2d6a6eff2d6a6fff2d6b70ff2d6c71ff2d6d72ff2d6d74ff2d6e75ff2d6f76ff2d7077ff2d7078ff2d7179ff2d727aff2d737bff2d737cff2d747dff2d757eff2d767fff2d7680ff2d7781ff000000ff000001ff000002ff000003ff000003ff000004ff000005ff000006ff000007ff000008ff000009ff00000aff00000aff00000bff00000cff00000dff00000eff00000fff000010ff000011ff000011ff000012ff000013ff000014ff000015ff000016ff000017ff00001eff000026ff00002eff000036ff00003dff000045ff00004dff000054ff00005cff000064ff00006cff000073ff00007bff000083ff00008bff000092ff00009aff0000a2ff0000a9ff0000b1ff0000b9ff0000c1ff0000c8ff0000d0ff0000d8ff0000dfff0000e7ff0000efff0000f7ff0000feff0007faff000ef5ff0016f0ff001debff0025e6ff002ce1ff0034dbff003bd6ff0043d1ff004bccff0052c7ff005ac2ff0061bcff0069b7ff0070b2ff0078adff007fa8ff0087a3ff008e9eff009698ff009d93ff00a58eff00ac89ff00b484ff00bb7fff00c379ff00ca74ff00d26fff00da6aff00e165ff00e960ff00f05bff00f855ff00ff50ff07fc4eff0ef94cff14f64aff1bf348ff22f046ff28ed44ff2fea41ff36e73fff3de33dff43e03bff4add39ff51da37ff57d735ff5ed433ff65d131ff6bce2eff72cb2cff79c82aff80c528ff86c226ff8dbf24ff94bc22ff9ab920ffa1b61effa8b31bffafb019ffb5ad17ffbca915ffc3a613ffc9a311ffd0a00fffd79d0dffdd9a0bffe49708ffeb9406fff29104fff88e020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
 --- !u!1001 &113426116
 Prefab:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1143740434}
-  m_LocalRotation: {x: -0.0004082999, y: 0.9450539, z: -0.0011799657, w: -0.32691234}
+  m_LocalRotation: {x: -0.00040952812, y: 0.9450558, z: -0.0011835321, w: -0.3269068}
  m_LocalPosition: {x: 42, y: 2.51, z: 62.1}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  m_Name: 
  m_EditorClassIdentifier: 
  _waterMaxDepth: 20
-  _colorRamp: {fileID: 41469276}
+  _colorRamp: {fileID: 112698118}
  _absorptionRampRaw:
    serializedVersion: 2
    key0: {r: 0.735849, g: 0.7154964, b: 0.5865966, a: 1}
    m_Mode: 0
    m_NumColorKeys: 3
    m_NumAlphaKeys: 2
-  _foamRamp: {fileID: 1816775808}
+  _foamRamp: {fileID: 2112974892}
  _foamRampRaw:
    serializedVersion: 2
    key0: {r: 0, g: 0, b: 0, a: 1}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1813459424}
  m_Mesh: {fileID: 4300008, guid: fb2f5cec30b474b89b778e3aab6f3dfe, type: 3}
--- !u!28 &1816775808
-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: ff000000ff000001ff000002ff000003ff000003ff000004ff000005ff000006ff000007ff000008ff000009ff00000aff00000aff00000bff00000cff00000dff00000eff00000fff000010ff000011ff000011ff000012ff000013ff000014ff000015ff000016ff000017ff00001eff000026ff00002eff000036ff00003dff000045ff00004dff000054ff00005cff000064ff00006cff000073ff00007bff000083ff00008bff000092ff00009aff0000a2ff0000a9ff0000b1ff0000b9ff0000c1ff0000c8ff0000d0ff0000d8ff0000dfff0000e7ff0000efff0000f7ff0000feff0007faff000ef5ff0016f0ff001debff0025e6ff002ce1ff0034dbff003bd6ff0043d1ff004bccff0052c7ff005ac2ff0061bcff0069b7ff0070b2ff0078adff007fa8ff0087a3ff008e9eff009698ff009d93ff00a58eff00ac89ff00b484ff00bb7fff00c379ff00ca74ff00d26fff00da6aff00e165ff00e960ff00f05bff00f855ff00ff50ff07fc4eff0ef94cff14f64aff1bf348ff22f046ff28ed44ff2fea41ff36e73fff3de33dff43e03bff4add39ff51da37ff57d735ff5ed433ff65d131ff6bce2eff72cb2cff79c82aff80c528ff86c226ff8dbf24ff94bc22ff9ab920ffa1b61effa8b31bffafb019ffb5ad17ffbca915ffc3a613ffc9a311ffd0a00fffd79d0dffdd9a0bffe49708ffeb9406fff29104fff88e02
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!1 &1817041918
 GameObject:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 4759700577955508, guid: 851454441f29b4ab9a78308458eafccb,
    type: 2}
  m_PrefabInternal: {fileID: 2107702316}
+--- !u!28 &2112974892
+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: ff000000ff000001ff000002ff000003ff000003ff000004ff000005ff000006ff000007ff000008ff000009ff00000aff00000aff00000bff00000cff00000dff00000eff00000fff000010ff000011ff000011ff000012ff000013ff000014ff000015ff000016ff000017ff00001eff000026ff00002eff000036ff00003dff000045ff00004dff000054ff00005cff000064ff00006cff000073ff00007bff000083ff00008bff000092ff00009aff0000a2ff0000a9ff0000b1ff0000b9ff0000c1ff0000c8ff0000d0ff0000d8ff0000dfff0000e7ff0000efff0000f7ff0000feff0007faff000ef5ff0016f0ff001debff0025e6ff002ce1ff0034dbff003bd6ff0043d1ff004bccff0052c7ff005ac2ff0061bcff0069b7ff0070b2ff0078adff007fa8ff0087a3ff008e9eff009698ff009d93ff00a58eff00ac89ff00b484ff00bb7fff00c379ff00ca74ff00d26fff00da6aff00e165ff00e960ff00f05bff00f855ff00ff50ff07fc4eff0ef94cff14f64aff1bf348ff22f046ff28ed44ff2fea41ff36e73fff3de33dff43e03bff4add39ff51da37ff57d735ff5ed433ff65d131ff6bce2eff72cb2cff79c82aff80c528ff86c226ff8dbf24ff94bc22ff9ab920ffa1b61effa8b31bffafb019ffb5ad17ffbca915ffc3a613ffc9a311ffd0a00fffd79d0dffdd9a0bffe49708ffeb9406fff29104fff88e02
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
 --- !u!1 &2114493842
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/scenes/Testing/WaterPerf.unity
+++ b/Assets/scenes/Testing/WaterPerf.unity
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
  m_Materials:
-  - {fileID: 2100000, guid: 4849d4d15a9cb42eb9533ae935e2630b, type: 2}
+  - {fileID: 2100000, guid: 7d5435876e995f24ea1d82f90b67d2d5, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
  m_Name: 
  m_EditorClassIdentifier: 
  _waterMaxDepth: 20
-  _colorRamp: {fileID: 1672339887}
+  _colorRamp: {fileID: 689528788}
  _absorptionRampRaw:
    serializedVersion: 2
    key0: {r: 0.57938766, g: 0.7924528, b: 0.6318919, a: 1}
    m_Mode: 0
    m_NumColorKeys: 3
    m_NumAlphaKeys: 2
-  _foamRamp: {fileID: 520887962}
+  _foamRamp: {fileID: 1526482455}
  _foamRampRaw:
    serializedVersion: 2
    key0: {r: 0, g: 0, b: 0, a: 1}
    m_NumColorKeys: 4
    m_NumAlphaKeys: 2
  _waves:
-  - amplitude: 0.47644794
-    direction: 129.36177
-    wavelength: 7.1652746
-    origin: {x: 6.386489, y: 36.450714}
+  - amplitude: 0.4365715
+    direction: 180.61304
+    wavelength: 8.208365
+    origin: {x: -93.45864, y: 170.51447}
-  - amplitude: 0.8047717
-    direction: 194.85706
-    wavelength: 8.420614
-    origin: {x: 229.05963, y: -78.716385}
+  - amplitude: 0.72301584
+    direction: 135.96017
+    wavelength: 7.93715
+    origin: {x: -228.97333, y: 68.73217}
-  - amplitude: 0.9748467
-    direction: 150.3815
-    wavelength: 13.614129
-    origin: {x: 9.101361, y: -90.7747}
+  - amplitude: 0.7248596
+    direction: 124.99663
+    wavelength: 9.025508
+    origin: {x: -19.390732, y: -131.34973}
-  - amplitude: 0.9408517
-    direction: 155.71176
-    wavelength: 16.967424
-    origin: {x: 185.44566, y: 232.6123}
+  - amplitude: 1.2829044
+    direction: 158.01178
+    wavelength: 9.726114
+    origin: {x: 134.39394, y: -230.25925}
-  - amplitude: 1.3619539
-    direction: 191.70428
-    wavelength: 16.516811
-    origin: {x: -14.194459, y: -114.33773}
+  - amplitude: 1.2107371
+    direction: 156.01396
+    wavelength: 11.12939
+    origin: {x: -186.81902, y: 206.02017}
-  - amplitude: 1.4719031
-    direction: 182.31554
-    wavelength: 22.029104
-    origin: {x: -228.73688, y: -117.15786}
+  - amplitude: 1.6542716
+    direction: 129.86841
+    wavelength: 15.76565
+    origin: {x: -244.08757, y: -158.62155}
-  randomSeed: 851
+  randomSeed: 989
  _basicWaveSettings:
    numWaves: 5
    amplitude: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 502038941}
--- !u!28 &520887962
-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: ff000000ff000004ff000008ff00000cff000010ff000014ff000018ff00001cff000020ff000024ff000028ff00002cff000030ff000033ff000037ff00003bff00003fff000043ff000047ff00004bff00004fff000053ff000057ff00005bff00005fff000063ff000067ff00006bff00006fff000073ff000077ff00007bff00007fff000083ff000087ff00008bff00008fff000093ff000097ff00009aff00009eff0000a2ff0000a6ff0000aaff0000aeff0000b2ff0000b6ff0000baff0000beff0000c2ff0000c6ff0000caff0000ceff0000d2ff0000d6ff0000daff0000deff0000e2ff0000e6ff0000eaff0000eeff0000f2ff0000f6ff0000faff0000feff0005fdff000df9ff0015f5ff001df1ff0025edff002deaff0035e6ff003de2ff0045deff004ddaff0055d7ff005dd3ff0065cfff006dcbff0075c8ff007dc4ff0084c0ff008cbcff0094b8ff009cb5ff00a4b1ff00acadff00b4a9ff00bca5ff00c4a2ff00cc9eff00d49aff00dc96ff00e492ff00ec8fff00f48bff00fc87ff05fe83ff0dfb7fff15f97bff1df776ff25f572ff2df36eff35f06aff3dee65ff46ec61ff4eea5dff56e859ff5ee555ff66e350ff6ee14cff76df48ff7edd44ff86da3fff8ed83bff96d637ff9ed433ffa6d22effaecf2affb6cd26ffbecb22ffc7c91effcfc719ffd7c415ffdfc211ffe7c00dffefbe08fff7bc04
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!4 &606056418
 Transform:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 611718039}
+--- !u!28 &689528788
+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: 4
+  m_CompleteImageSize: 2048
+  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: 2048
+  _typelessdata: ff94caa1ff90c39cff8dbd96ff89b691ff86af8cff82a886ff7da686ff78a587ff72a489ff6ca38bff67a38dff61a28eff5ba190ff56a092ff50a094ff4a9f95ff459e97ff3f9e99ff399d9bff359c9cff349b9bff339b9aff329a9aff319999ff2f9898ff2e9898ff2d9797ff2c9697ff2b9596ff2a9495ff289495ff279394ff269294ff259193ff249192ff229092ff218f91ff208e91ff1f8e90ff1e8d8fff1c8c8fff1b8b8eff1a8b8dff198a8dff18898cff17888cff15888bff14878aff13868aff128589ff118489ff0f8488ff0e8387ff0d8287ff0c8186ff0b8186ff098085ff087f84ff077e84ff067e83ff057d82ff047c82ff027b81ff017b81ff007a80ff00797fff00787eff00767eff00757dff00747cff00737bff00727aff00717aff006f79ff006e78ff006d77ff006c76ff006b76ff006a75ff006974ff006773ff006672ff006572ff006471ff006370ff00626fff00616eff005f6eff005e6dff005d6cff005c6bff005b6aff005a6aff005969ff005768ff005667ff005567ff005466ff005365ff005264ff005163ff004f63ff004e62ff004d61ff004c60ff004b5fff004a5fff00495eff00475dff00465cff00455bff00445bff00435aff004259ff004058ff003f57ff003e57ff003d56ff003c55ff003b54ff003a53ff003853ff003752ff003651ff003550ff00344fff00334fff00324eff000000ff010201ff030302ff040503ff060604ff070805ff090906ff0a0b07ff0c0c08ff0d0e09ff0f0f0aff10110bff12130cff13140dff15160eff16170fff181910ff191a10ff1b1c11ff1c1d12ff1e1f13ff1f2014ff212215ff222416ff232517ff252718ff262819ff282a1aff292b1bff2b2d1cff2c2e1dff2e301eff2e311fff2e3220ff2e3221ff2e3322ff2e3423ff2e3424ff2e3525ff2e3626ff2e3727ff2e3728ff2e3829ff2e392aff2e3a2bff2e3a2cff2e3b2eff2e3c2fff2e3d30ff2e3d31ff2e3e32ff2e3f33ff2e4034ff2e4035ff2e4136ff2e4237ff2e4338ff2e4339ff2e443aff2e453bff2e453cff2e463dff2e473eff2e483fff2e4840ff2e4941ff2e4a42ff2e4b43ff2e4b44ff2d4c45ff2d4d46ff2d4e47ff2d4e48ff2d4f49ff2d504aff2d514bff2d514cff2d524dff2d534eff2d544fff2d5451ff2d5552ff2d5653ff2d5654ff2d5755ff2d5856ff2d5957ff2d5958ff2d5a59ff2d5b5aff2d5c5bff2d5c5cff2d5d5dff2d5e5eff2d5f5fff2d5f60ff2d6061ff2d6162ff2d6263ff2d6264ff2d6365ff2d6466ff2d6567ff2d6568ff2d6669ff2d676aff2d676bff2d686cff2d696dff2d6a6eff2d6a6fff2d6b70ff2d6c71ff2d6d72ff2d6d73ff2d6e75ff2d6f76ff2d7077ff2d7078ff2d7179ff2d727aff2d737bff2d737cff2d747dff2d757eff2d767fff2d7680ff2d7781ff000000ff000004ff000008ff00000cff000010ff000014ff000018ff00001cff000020ff000024ff000028ff00002cff000030ff000033ff000037ff00003bff00003fff000043ff000047ff00004bff00004fff000053ff000057ff00005bff00005fff000063ff000067ff00006bff00006fff000073ff000077ff00007bff00007fff000083ff000087ff00008bff00008fff000093ff000097ff00009aff00009eff0000a2ff0000a6ff0000aaff0000aeff0000b2ff0000b6ff0000baff0000beff0000c2ff0000c6ff0000caff0000ceff0000d2ff0000d6ff0000daff0000deff0000e2ff0000e6ff0000eaff0000eeff0000f2ff0000f6ff0000faff0000feff0005fdff000df9ff0015f5ff001df1ff0025edff002deaff0035e6ff003de2ff0045deff004ddaff0055d7ff005dd3ff0065cfff006dcbff0075c8ff007dc4ff0084c0ff008cbcff0094b8ff009cb5ff00a4b1ff00acadff00b4a9ff00bca5ff00c4a2ff00cc9eff00d49aff00dc96ff00e492ff00ec8fff00f48bff00fc87ff05fe83ff0dfb7fff15f97bff1df776ff25f572ff2df36eff35f06aff3dee65ff46ec61ff4eea5dff56e859ff5ee555ff66e350ff6ee14cff76df48ff7edd44ff86da3fff8ed83bff96d637ff9ed433ffa6d22effaecf2affb6cd26ffbecb22ffc7c91effcfc719ffd7c415ffdfc211ffe7c00dffefbe08fff7bc040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
 --- !u!1 &692220559
 GameObject:
  m_ObjectHideFlags: 0
    m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0,
      Culture=neutral, PublicKeyToken=null
  m_IsOn: 1
+--- !u!28 &1526482455
+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: ff000000ff000004ff000008ff00000cff000010ff000014ff000018ff00001cff000020ff000024ff000028ff00002cff000030ff000033ff000037ff00003bff00003fff000043ff000047ff00004bff00004fff000053ff000057ff00005bff00005fff000063ff000067ff00006bff00006fff000073ff000077ff00007bff00007fff000083ff000087ff00008bff00008fff000093ff000097ff00009aff00009eff0000a2ff0000a6ff0000aaff0000aeff0000b2ff0000b6ff0000baff0000beff0000c2ff0000c6ff0000caff0000ceff0000d2ff0000d6ff0000daff0000deff0000e2ff0000e6ff0000eaff0000eeff0000f2ff0000f6ff0000faff0000feff0005fdff000df9ff0015f5ff001df1ff0025edff002deaff0035e6ff003de2ff0045deff004ddaff0055d7ff005dd3ff0065cfff006dcbff0075c8ff007dc4ff0084c0ff008cbcff0094b8ff009cb5ff00a4b1ff00acadff00b4a9ff00bca5ff00c4a2ff00cc9eff00d49aff00dc96ff00e492ff00ec8fff00f48bff00fc87ff05fe83ff0dfb7fff15f97bff1df776ff25f572ff2df36eff35f06aff3dee65ff46ec61ff4eea5dff56e859ff5ee555ff66e350ff6ee14cff76df48ff7edd44ff86da3fff8ed83bff96d637ff9ed433ffa6d22effaecf2affb6cd26ffbecb22ffc7c91effcfc719ffd7c415ffdfc211ffe7c00dffefbe08fff7bc04
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
 --- !u!1 &1575981534
 GameObject:
  m_ObjectHideFlags: 0
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0}
--- !u!28 &1672339887
-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: ff94caa1ff90c39cff8dbd96ff89b691ff86af8cff82a886ff7da686ff78a587ff72a489ff6ca38bff67a38dff61a28eff5ba190ff56a092ff50a094ff4a9f95ff459e97ff3f9e99ff399d9bff359c9cff349b9bff339b9aff329a9aff319999ff2f9898ff2e9898ff2d9797ff2c9697ff2b9596ff2a9495ff289495ff279394ff269294ff259193ff249192ff229092ff218f91ff208e91ff1f8e90ff1e8d8fff1c8c8fff1b8b8eff1a8b8dff198a8dff18898cff17888cff15888bff14878aff13868aff128589ff118489ff0f8488ff0e8387ff0d8287ff0c8186ff0b8186ff098085ff087f84ff077e84ff067e83ff057d82ff047c82ff027b81ff017b81ff007a80ff00797fff00787eff00767eff00757dff00747cff00737bff00727aff00717aff006f79ff006e78ff006d77ff006c76ff006b76ff006a75ff006974ff006773ff006672ff006572ff006471ff006370ff00626fff00616eff005f6eff005e6dff005d6cff005c6bff005b6aff005a6aff005969ff005768ff005667ff005567ff005466ff005365ff005264ff005163ff004f63ff004e62ff004d61ff004c60ff004b5fff004a5fff00495eff00475dff00465cff00455bff00445bff00435aff004259ff004058ff003f57ff003e57ff003d56ff003c55ff003b54ff003a53ff003853ff003752ff003651ff003550ff00344fff00334fff00324eff000000ff010201ff030302ff040503ff060604ff070805ff090906ff0a0b07ff0c0c08ff0d0e09ff0f0f0aff10110bff12130cff13140dff15160eff16170fff181910ff191a10ff1b1c11ff1c1d12ff1e1f13ff1f2014ff212215ff222416ff232517ff252718ff262819ff282a1aff292b1bff2b2d1cff2c2e1dff2e301eff2e311fff2e3220ff2e3221ff2e3322ff2e3423ff2e3424ff2e3525ff2e3626ff2e3727ff2e3728ff2e3829ff2e392aff2e3a2bff2e3a2cff2e3b2eff2e3c2fff2e3d30ff2e3d31ff2e3e32ff2e3f33ff2e4034ff2e4035ff2e4136ff2e4237ff2e4338ff2e4339ff2e443aff2e453bff2e453cff2e463dff2e473eff2e483fff2e4840ff2e4941ff2e4a42ff2e4b43ff2e4b44ff2d4c45ff2d4d46ff2d4e47ff2d4e48ff2d4f49ff2d504aff2d514bff2d514cff2d524dff2d534eff2d544fff2d5451ff2d5552ff2d5653ff2d5654ff2d5755ff2d5856ff2d5957ff2d5958ff2d5a59ff2d5b5aff2d5c5bff2d5c5cff2d5d5dff2d5e5eff2d5f5fff2d5f60ff2d6061ff2d6162ff2d6263ff2d6264ff2d6365ff2d6466ff2d6567ff2d6568ff2d6669ff2d676aff2d676bff2d686cff2d696dff2d6a6eff2d6a6fff2d6b70ff2d6c71ff2d6d72ff2d6d73ff2d6e75ff2d6f76ff2d7077ff2d7078ff2d7179ff2d727aff2d737bff2d737cff2d747dff2d757eff2d767fff2d7680ff2d7781
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!1 &1679496160
 GameObject:
  m_ObjectHideFlags: 0
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Scenes:
-  - 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/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
-m_EditorVersion: 2018.1.0b12
+m_EditorVersion: 2018.1.0b13