diff --git a/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Materials/LakesAndRivers_Material_Water.mat b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Materials/LakesAndRivers_Material_Water.mat index 5a94320e7..8af7c8f21 100644 --- a/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Materials/LakesAndRivers_Material_Water.mat +++ b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Materials/LakesAndRivers_Material_Water.mat @@ -124,6 +124,7 @@ Material: - _NormalsStrengthOverall: 1 - _Offset: 0.00008 - _OverrideReflectionCubemap: 0 + - _PlanarReflectionDistanceFactor: 0 - _PlanarReflectionIntensity: 1 - _PlanarReflectionNormalsStrength: 1 - _PlanarReflections: 0 @@ -133,7 +134,7 @@ Material: - _RefractionStrength: 1 - _RefractiveIndexOfAir: 1 - _RefractiveIndexOfWater: 1.333 - - _Roughness: 0 + - _Roughness: 0.062 - _S: 1 - _Shadows: 0 - _ShorelineFoamMinDepth: 0.27 diff --git a/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Scenes/Internal/LakesAndRiversSceneCore.prefab b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Scenes/Internal/LakesAndRiversSceneCore.prefab index b44f9c91e..68979ff40 100644 --- a/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Scenes/Internal/LakesAndRiversSceneCore.prefab +++ b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Scenes/Internal/LakesAndRiversSceneCore.prefab @@ -1,5 +1,272 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &726828342 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 726828343} + - component: {fileID: 726828347} + - component: {fileID: 726828346} + - component: {fileID: 726828345} + - component: {fileID: 726828344} + m_Layer: 0 + m_Name: SplinePoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &726828343 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726828342} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 159.15, y: -0.64, z: 117.16998} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8569238539655344397} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &726828347 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726828342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 128486e28072dc741bdfd69bef81aeae, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 0 +--- !u!114 &726828346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726828342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09749b5cc9b995e4eb7c9552fd09118e, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 0 + _radiusMultiplier: 1 +--- !u!114 &726828345 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726828342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bfdd42d729f2b1446ac97aaedcf7694a, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 0 + _flowVelocity: 0 +--- !u!114 &726828344 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726828342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 195788a19db58f145908f7b22a193f41, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 0 + _weight: 1 +--- !u!1 &1661853822 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1661853823} + - component: {fileID: 1661853827} + - component: {fileID: 1661853826} + - component: {fileID: 1661853825} + - component: {fileID: 1661853824} + m_Layer: 0 + m_Name: SplinePoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1661853823 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1661853822} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -6.8099976, y: 0.39, z: 1.8699951} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8569238539512446965} + m_RootOrder: 19 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1661853827 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1661853822} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 128486e28072dc741bdfd69bef81aeae, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 0 +--- !u!114 &1661853826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1661853822} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09749b5cc9b995e4eb7c9552fd09118e, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 0 + _radiusMultiplier: 1 +--- !u!114 &1661853825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1661853822} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 195788a19db58f145908f7b22a193f41, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 0 + _weight: 1 +--- !u!114 &1661853824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1661853822} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bfdd42d729f2b1446ac97aaedcf7694a, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 0 + _flowVelocity: 2 +--- !u!1 &1874313056 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1874313057} + - component: {fileID: 1874313061} + - component: {fileID: 1874313060} + - component: {fileID: 1874313059} + - component: {fileID: 1874313058} + m_Layer: 0 + m_Name: SplinePoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1874313057 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874313056} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 160.38, y: 8.505001, z: 86.2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8569238539512446965} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1874313061 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874313056} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 128486e28072dc741bdfd69bef81aeae, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 0 +--- !u!114 &1874313060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874313056} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09749b5cc9b995e4eb7c9552fd09118e, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 0 + _radiusMultiplier: 1 +--- !u!114 &1874313059 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874313056} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 195788a19db58f145908f7b22a193f41, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 0 + _weight: 1 +--- !u!114 &1874313058 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874313056} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bfdd42d729f2b1446ac97aaedcf7694a, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 0 + _flowVelocity: 2 --- !u!1 &8569238538359182391 GameObject: m_ObjectHideFlags: 0 @@ -32,7 +299,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238538359182388 MonoBehaviour: @@ -145,6 +412,7 @@ MonoBehaviour: _hideDepthCacheCam: 1 _savedCache: {fileID: 0} _runValidationOnStart: 1 + _relative: 0 --- !u!1 &8569238538483165221 GameObject: m_ObjectHideFlags: 0 @@ -177,7 +445,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 20 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238538483165216 MonoBehaviour: @@ -308,7 +576,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _version: 0 - _flowVelocity: 2 + _flowVelocity: 0 --- !u!114 &8569238538489450214 MonoBehaviour: m_ObjectHideFlags: 0 @@ -371,7 +639,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 155 m_DetailObjectDensity: 0.75 - m_HeightmapPixelError: 2 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -447,7 +715,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 80 m_DetailObjectDensity: 1 - m_HeightmapPixelError: 20 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -507,7 +775,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238538580091993 MonoBehaviour: @@ -612,7 +880,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 80 m_DetailObjectDensity: 1 - m_HeightmapPixelError: 20 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -668,11 +936,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8569238538625171397} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -13.619995, y: 0, z: 3.739975} + m_LocalPosition: {x: -13.619995, y: 0.05, z: 3.739975} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 18 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238538625171394 MonoBehaviour: @@ -761,7 +1029,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238538649164057 MonoBehaviour: @@ -846,7 +1114,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8569238538693301163} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 173.12, y: 8.61, z: 88.98} + m_LocalPosition: {x: 171.78, y: 8.61, z: 96.09} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} @@ -878,7 +1146,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _version: 0 - _radiusMultiplier: 3.08 + _radiusMultiplier: 1 --- !u!114 &8569238538693301175 MonoBehaviour: m_ObjectHideFlags: 0 @@ -955,7 +1223,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 250 m_DetailObjectDensity: 1 - m_HeightmapPixelError: 20 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -1031,7 +1299,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 80 m_DetailObjectDensity: 1 - m_HeightmapPixelError: 20 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -1091,7 +1359,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 17 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238538826745986 MonoBehaviour: @@ -1133,7 +1401,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _version: 0 - _flowVelocity: 2 + _flowVelocity: 3 --- !u!114 &8569238538826745984 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1180,7 +1448,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238538908231028 MonoBehaviour: @@ -1285,7 +1553,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 80 m_DetailObjectDensity: 1 - m_HeightmapPixelError: 20 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -1341,11 +1609,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8569238539072300703} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 157.16, y: 8.4, z: 80.62} + m_LocalPosition: {x: 156.46, y: 8.4, z: 78.54} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238539072300700 MonoBehaviour: @@ -1450,7 +1718,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 80 m_DetailObjectDensity: 1 - m_HeightmapPixelError: 20 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -1490,6 +1758,7 @@ GameObject: - component: {fileID: 8569238539104034491} - component: {fileID: 8569238539104034492} - component: {fileID: 8569238539104034493} + - component: {fileID: 1661933922} m_Layer: 0 m_Name: SplinePoint m_TagString: Untagged @@ -1505,7 +1774,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8569238539104034495} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 152.09, y: 0, z: 128} + m_LocalPosition: {x: 150.3, y: -0.24, z: 135.3} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539655344397} @@ -1552,6 +1821,20 @@ MonoBehaviour: m_EditorClassIdentifier: _version: 0 _flowVelocity: 0 +--- !u!114 &1661933922 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8569238539104034495} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 195788a19db58f145908f7b22a193f41, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 0 + _weight: 1 --- !u!1 &8569238539131218078 GameObject: m_ObjectHideFlags: 0 @@ -1630,7 +1913,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238539214998854 MonoBehaviour: @@ -1735,7 +2018,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 80 m_DetailObjectDensity: 1 - m_HeightmapPixelError: 20 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -1795,7 +2078,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238539446171644 MonoBehaviour: @@ -1888,6 +2171,7 @@ Transform: - {fileID: 8569238540248134405} - {fileID: 8569238539735093379} - {fileID: 8569238538693301162} + - {fileID: 1874313057} - {fileID: 8569238539072300702} - {fileID: 8569238538649164059} - {fileID: 8569238540113900597} @@ -1901,6 +2185,7 @@ Transform: - {fileID: 8569238539525547523} - {fileID: 8569238539917397352} - {fileID: 8569238538826745988} + - {fileID: 1661853823} - {fileID: 8569238538625171396} - {fileID: 8569238540202253580} - {fileID: 8569238538483165220} @@ -1922,7 +2207,7 @@ MonoBehaviour: _version: 1 _offset: 1 _closed: 0 - _radius: 20 + _radius: 25 _subdivisions: 1 --- !u!114 &8569238539512446962 MonoBehaviour: @@ -1939,11 +2224,12 @@ MonoBehaviour: _checkShaderName: 1 _checkShaderPasses: 1 _disableRenderer: 1 - _overrideSplineSettings: 0 + _overrideSplineSettings: 1 _radius: 20 - _subdivisions: 1 + _subdivisions: 8 _version: 0 - _maxDisplacementVertical: 0 + _debug: + _drawBounds: 0 --- !u!114 &8569238539512446963 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1964,9 +2250,8 @@ MonoBehaviour: _respectShallowWaterAttenuation: 1 _weight: 1 _blendMode: 1 - _queue: 1 - _resolution: 128 - _debugDrawSlicesInEditor: 0 + _queue: 2 + _resolution: 256 _overrideSplineSettings: 0 _radius: 50 _subdivisions: 1 @@ -1979,6 +2264,9 @@ MonoBehaviour: _timeResolution: 4 _smallestWavelengthRequired: 2 _timeLoopLength: 32 + _debug: + _drawBounds: 0 + _drawSlicesInEditor: 0 --- !u!114 &8569238539512446964 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2031,7 +2319,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238539525547521 MonoBehaviour: @@ -2073,7 +2361,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _version: 0 - _flowVelocity: 2 + _flowVelocity: 3 --- !u!114 &8569238539525547535 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2136,7 +2424,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 80 m_DetailObjectDensity: 1 - m_HeightmapPixelError: 20 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -2212,7 +2500,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 80 m_DetailObjectDensity: 1 - m_HeightmapPixelError: 20 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -2339,6 +2627,7 @@ Transform: - {fileID: 8569238539812410631} - {fileID: 8569238539104034494} - {fileID: 8569238539967241774} + - {fileID: 726828343} m_Father: {fileID: 8569238540048811958} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2374,11 +2663,12 @@ MonoBehaviour: _checkShaderName: 1 _checkShaderPasses: 1 _disableRenderer: 1 - _overrideSplineSettings: 0 - _radius: 20 - _subdivisions: 1 + _overrideSplineSettings: 1 + _radius: 25 + _subdivisions: 4 _version: 0 - _maxDisplacementVertical: 0 + _debug: + _drawBounds: 0 --- !u!114 &8569238539655344396 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2411,17 +2701,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a57126133720c243a7af00a156c9ee8, type: 3} m_Name: m_EditorClassIdentifier: - _spectrum: {fileID: 11400000, guid: d881c615fb1c1e74a9ed7c32696cc459, type: 2} + _spectrum: {fileID: 11400000, guid: 7bef21ae7a1574f8f8b6b90837c87779, type: 2} _spectrumFixedAtRuntime: 1 - _waveDirectionHeadingAngle: 0 + _waveDirectionHeadingAngle: 90 _overrideGlobalWindSpeed: 0 _windSpeed: 20 _respectShallowWaterAttenuation: 1 - _weight: 0.5 + _weight: 1 _blendMode: 1 _queue: 1 _resolution: 128 - _debugDrawSlicesInEditor: 0 _overrideSplineSettings: 0 _radius: 50 _subdivisions: 1 @@ -2434,6 +2723,9 @@ MonoBehaviour: _timeResolution: 4 _smallestWavelengthRequired: 2 _timeLoopLength: 32 + _debug: + _drawBounds: 0 + _drawSlicesInEditor: 0 --- !u!1 &8569238539701281965 GameObject: m_ObjectHideFlags: 0 @@ -2482,7 +2774,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 80 m_DetailObjectDensity: 1 - m_HeightmapPixelError: 20 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -2611,6 +2903,7 @@ GameObject: - component: {fileID: 8569238539751324152} - component: {fileID: 8569238539751324153} - component: {fileID: 8569238539751324154} + - component: {fileID: 614009262} m_Layer: 0 m_Name: SplinePoint m_TagString: Untagged @@ -2673,6 +2966,20 @@ MonoBehaviour: m_EditorClassIdentifier: _version: 0 _flowVelocity: 0 +--- !u!114 &614009262 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8569238539751324156} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 195788a19db58f145908f7b22a193f41, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 0 + _weight: 1 --- !u!1 &8569238539776204925 GameObject: m_ObjectHideFlags: 0 @@ -2736,7 +3043,7 @@ MonoBehaviour: _minScale: 8 _maxScale: 256 _dropDetailHeightBasedOnWaves: 0.2 - _lodDataResolution: 384 + _lodDataResolution: 768 _geometryDownSampleFactor: 2 _lodCount: 7 _extentsSizeMultiplier: 100 @@ -2763,12 +3070,16 @@ MonoBehaviour: _editModeFPS: 30 _followSceneCamera: 1 _heightQueries: 1 - _forceBatchMode: 0 - _forceNoGPU: 0 - _attachDebugGUI: 0 - _hideOceanTileGameObjects: 1 - _uniformTiles: 0 - _disableSkirt: 0 + _debug: + _attachDebugGUI: 0 + _showOceanTileGameObjects: 0 + _disableFollowViewpoint: 0 + _uniformTiles: 0 + _disableSkirt: 0 + _drawLodOutline: 0 + _destroyResourcesInOnDisable: 0 + _forceBatchMode: 0 + _forceNoGPU: 0 --- !u!1 &8569238539784465188 GameObject: m_ObjectHideFlags: 0 @@ -2817,7 +3128,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 80 m_DetailObjectDensity: 1 - m_HeightmapPixelError: 20 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -2982,7 +3293,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 155 m_DetailObjectDensity: 0.75 - m_HeightmapPixelError: 2 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -3120,7 +3431,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _version: 0 - _weight: 1 + _weight: 0 --- !u!114 &8569238539879285432 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3134,7 +3445,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _version: 0 - _flowVelocity: 2 + _flowVelocity: 0 --- !u!1 &8569238539917397353 GameObject: m_ObjectHideFlags: 0 @@ -3167,7 +3478,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238539917397366 MonoBehaviour: @@ -3209,7 +3520,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _version: 0 - _flowVelocity: 2 + _flowVelocity: 3 --- !u!114 &8569238539917397364 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3252,7 +3563,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8569238539967241775} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 154.23999, y: -0.6149998, z: 125.265015} + m_LocalPosition: {x: 155.53, y: -0.6149998, z: 123.38} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539655344397} @@ -3298,7 +3609,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _version: 0 - _flowVelocity: 2 + _flowVelocity: 1 --- !u!114 &4095344463160103186 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3361,7 +3672,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 80 m_DetailObjectDensity: 1 - m_HeightmapPixelError: 20 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -3464,7 +3775,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a57126133720c243a7af00a156c9ee8, type: 3} m_Name: m_EditorClassIdentifier: - _spectrum: {fileID: 0} + _spectrum: {fileID: 11400000, guid: 92836998c0a654f208bd7389342d7ca4, type: 2} _spectrumFixedAtRuntime: 1 _waveDirectionHeadingAngle: -180 _overrideGlobalWindSpeed: 1 @@ -3474,7 +3785,6 @@ MonoBehaviour: _blendMode: 0 _queue: 0 _resolution: 128 - _debugDrawSlicesInEditor: 0 _overrideSplineSettings: 0 _radius: 50 _subdivisions: 1 @@ -3487,6 +3797,9 @@ MonoBehaviour: _timeResolution: 4 _smallestWavelengthRequired: 2 _timeLoopLength: 32 + _debug: + _drawBounds: 0 + _drawSlicesInEditor: 0 --- !u!1 &8569238540113900598 GameObject: m_ObjectHideFlags: 0 @@ -3519,7 +3832,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238540113900595 MonoBehaviour: @@ -3608,7 +3921,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 19 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238540202253576 MonoBehaviour: @@ -3697,7 +4010,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238540204902292 MonoBehaviour: @@ -3802,7 +4115,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 155 m_DetailObjectDensity: 0.75 - m_HeightmapPixelError: 2 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -3858,7 +4171,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8569238540248134406} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 159.15, y: 9.68, z: 117.17} + m_LocalPosition: {x: 159.15, y: 9.36, z: 117.17} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} @@ -3918,7 +4231,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _version: 0 - _weight: 1 + _weight: 0.5 --- !u!1 &8569238540343942294 GameObject: m_ObjectHideFlags: 0 @@ -3982,7 +4295,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8569238539512446965} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8569238540349272757 MonoBehaviour: @@ -4087,7 +4400,7 @@ Terrain: m_TreeMaximumFullLODCount: 50 m_DetailObjectDistance: 155 m_DetailObjectDensity: 0.75 - m_HeightmapPixelError: 2 + m_HeightmapPixelError: 1 m_SplatMapDistance: 2000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 2 @@ -4308,6 +4621,11 @@ PrefabInstance: propertyPath: m_Name value: DemoLighting objectReference: {fileID: 0} + - target: {fileID: 6141750961475219240, guid: 37bbe23c17398419cbc8674f5c5dbccb, + type: 3} + propertyPath: m_Intensity + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6141750961475219240, guid: 37bbe23c17398419cbc8674f5c5dbccb, type: 3} propertyPath: m_Lightmapping @@ -4315,18 +4633,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 37bbe23c17398419cbc8674f5c5dbccb, type: 3} ---- !u!108 &2582793465690369722 stripped -Light: - m_CorrespondingSourceObject: {fileID: 6141750961475219240, guid: 37bbe23c17398419cbc8674f5c5dbccb, - type: 3} - m_PrefabInstance: {fileID: 8569238538569662866} - m_PrefabAsset: {fileID: 0} --- !u!4 &7315944180379875101 stripped Transform: m_CorrespondingSourceObject: {fileID: 1399345652565587599, guid: 37bbe23c17398419cbc8674f5c5dbccb, type: 3} m_PrefabInstance: {fileID: 8569238538569662866} m_PrefabAsset: {fileID: 0} +--- !u!108 &2582793465690369722 stripped +Light: + m_CorrespondingSourceObject: {fileID: 6141750961475219240, guid: 37bbe23c17398419cbc8674f5c5dbccb, + type: 3} + m_PrefabInstance: {fileID: 8569238538569662866} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8569238539632238595 PrefabInstance: m_ObjectHideFlags: 0 @@ -4394,6 +4712,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2452750316707852751, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_HDR + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852751, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_AllowMSAA + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cada5253abff1481b98c0880eb065d8e, type: 3} --- !u!4 &6117548995557773775 stripped diff --git a/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_SimSettings_AnimatedWaves.asset b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_SimSettings_AnimatedWaves.asset index 1685d3c79..35b5183e0 100644 --- a/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_SimSettings_AnimatedWaves.asset +++ b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_SimSettings_AnimatedWaves.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: LakesAndRivers_SimSettings_AnimatedWaves m_EditorClassIdentifier: _version: 0 + _waveResolutionMultiplier: 3 _attenuationInShallows: 0.5 _shallowsMaxDepth: 1000 _collisionSource: 2 diff --git a/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_SimSettings_Foam.asset b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_SimSettings_Foam.asset index eadbbdc77..21aa50b9d 100644 --- a/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_SimSettings_Foam.asset +++ b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_SimSettings_Foam.asset @@ -17,6 +17,7 @@ MonoBehaviour: _foamFadeRate: 0.5 _waveFoamStrength: 1.17 _waveFoamCoverage: 0.517 + _filterWaves: 0 _shorelineFoamMaxDepth: 0.65 _shorelineFoamStrength: 0 _renderTextureGraphicsFormat: 45 diff --git a/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_Lake.asset b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_Lake.asset new file mode 100644 index 000000000..138355a5f --- /dev/null +++ b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_Lake.asset @@ -0,0 +1,69 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33068fc021dadc04dab6e00e4ff45c00, type: 3} + m_Name: LakesAndRivers_WaveSpectrum_Lake + m_EditorClassIdentifier: + _version: 1 + _fetch: 500000 + _waveDirectionVariance: 56 + _gravityScale: 1 + _smallWavelengthMultiplier: 1 + _multiplier: 1 + _powerLog: + - -7.39794 + - -7.39794 + - -7.39794 + - -6.3747597 + - -4.8159227 + - -4.413246 + - -4.081862 + - -3.7773297 + - -3.8762438 + - -3.824092 + - -3.4170768 + - -3.2395759 + - -3.2135434 + - -7.39794 + _powerDisabled: 0000000001010101010101010101 + _chopScales: + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + _gravityScales: + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + _chop: 1 + _showAdvancedControls: 0 + _model: 0 diff --git a/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_Lake.asset.meta b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_Lake.asset.meta new file mode 100644 index 000000000..83fa871e8 --- /dev/null +++ b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_Lake.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7bef21ae7a1574f8f8b6b90837c87779 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_LakeLarge.asset b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_LakeLarge.asset new file mode 100644 index 000000000..e872656e0 --- /dev/null +++ b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_LakeLarge.asset @@ -0,0 +1,69 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33068fc021dadc04dab6e00e4ff45c00, type: 3} + m_Name: LakesAndRivers_WaveSpectrum_LakeLarge + m_EditorClassIdentifier: + _version: 1 + _fetch: 500000 + _waveDirectionVariance: 90 + _gravityScale: 1 + _smallWavelengthMultiplier: 1 + _multiplier: 1 + _powerLog: + - -7.10794 + - -6.4279404 + - -5.93794 + - -5.2779403 + - -4.67794 + - -3.7179399 + - -3.17794 + - -2.6079402 + - -1.9379401 + - -1.1179401 + - -0.85794 + - -0.36794007 + - 0.042060018 + - -9.39794 + _powerDisabled: 0101000000000101010101010101 + _chopScales: + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + _gravityScales: + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + _chop: 1.6 + _showAdvancedControls: 0 + _model: 0 diff --git a/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_LakeLarge.asset.meta b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_LakeLarge.asset.meta new file mode 100644 index 000000000..9c13c180d --- /dev/null +++ b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_LakeLarge.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 92836998c0a654f208bd7389342d7ca4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_River.asset b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_River.asset index e1115c6c3..e21cb2a50 100644 --- a/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_River.asset +++ b/crest/Assets/Crest/Crest-Examples/LakesAndRivers/Settings/LakesAndRivers_WaveSpectrum_River.asset @@ -22,9 +22,9 @@ MonoBehaviour: - -7.10794 - -6.4279404 - -5.93794 - - -4.899759 - - -4.0003643 - - -2.6464248 + - -5.348895 + - -4.4245486 + - -3.8330135 - -3.17794 - -2.6079402 - -1.9379401 @@ -64,6 +64,6 @@ MonoBehaviour: - 1 - 1 - 1 - _chop: 2 + _chop: 1.151 _showAdvancedControls: 0 _model: 0