From 8ef586432c30b8f98c678479726e89cb64fb4a50 Mon Sep 17 00:00:00 2001 From: Dale Eidd Date: Thu, 13 May 2021 12:06:16 -0700 Subject: [PATCH] Add test data --- .../Crest-Examples/Main/Scenes/main.unity | 443 +++++++++++++++++- crest/ProjectSettings/TagManager.asset | 2 +- 2 files changed, 437 insertions(+), 8 deletions(-) diff --git a/crest/Assets/Crest/Crest-Examples/Main/Scenes/main.unity b/crest/Assets/Crest/Crest-Examples/Main/Scenes/main.unity index c2dbd3d40d..419836c326 100644 --- a/crest/Assets/Crest/Crest-Examples/Main/Scenes/main.unity +++ b/crest/Assets/Crest/Crest-Examples/Main/Scenes/main.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.40711796, g: 0.5924692, b: 0.9424595, a: 1} + m_IndirectSpecularColor: {r: 0.40657905, g: 0.5909717, b: 0.9444369, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 12 m_Resolution: 1 m_BakeResolution: 50 m_AtlasSize: 1024 @@ -62,6 +62,7 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 0 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -76,10 +77,16 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -87,7 +94,9 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 0 --- !u!196 &5 @@ -112,6 +121,83 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!4 &253380425 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9037604615445586465, guid: ddf71bfb72c45407fb8cea42d3aaeac4, + type: 3} + m_PrefabInstance: {fileID: 1030721467} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &972521919 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1691304088} + m_Modifications: + - target: {fileID: 1040961582426892, guid: 6d79ad5f5edb537448c2c13e54ffac88, type: 3} + propertyPath: m_Name + value: UnderWaterMeniscus + objectReference: {fileID: 0} + - target: {fileID: 1040961582426892, guid: 6d79ad5f5edb537448c2c13e54ffac88, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 4478995129147352, guid: 6d79ad5f5edb537448c2c13e54ffac88, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4478995129147352, guid: 6d79ad5f5edb537448c2c13e54ffac88, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4478995129147352, guid: 6d79ad5f5edb537448c2c13e54ffac88, type: 3} + propertyPath: m_LocalPosition.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4478995129147352, guid: 6d79ad5f5edb537448c2c13e54ffac88, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4478995129147352, guid: 6d79ad5f5edb537448c2c13e54ffac88, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4478995129147352, guid: 6d79ad5f5edb537448c2c13e54ffac88, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4478995129147352, guid: 6d79ad5f5edb537448c2c13e54ffac88, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4478995129147352, guid: 6d79ad5f5edb537448c2c13e54ffac88, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4478995129147352, guid: 6d79ad5f5edb537448c2c13e54ffac88, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4478995129147352, guid: 6d79ad5f5edb537448c2c13e54ffac88, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4478995129147352, guid: 6d79ad5f5edb537448c2c13e54ffac88, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 33624370962103636, guid: 6d79ad5f5edb537448c2c13e54ffac88, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 114844744040553458, guid: 6d79ad5f5edb537448c2c13e54ffac88, + type: 3} + propertyPath: _camera + value: + objectReference: {fileID: 1691304089} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6d79ad5f5edb537448c2c13e54ffac88, type: 3} --- !u!1001 &1030721467 PrefabInstance: m_ObjectHideFlags: 0 @@ -119,10 +205,55 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 9037604615445586478, guid: ddf71bfb72c45407fb8cea42d3aaeac4, + - target: {fileID: 4340091527242924124, guid: ddf71bfb72c45407fb8cea42d3aaeac4, type: 3} - propertyPath: m_Name - value: MainScene + propertyPath: m_LocalPosition.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4349685420347098742, guid: ddf71bfb72c45407fb8cea42d3aaeac4, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 4357478467148098300, guid: ddf71bfb72c45407fb8cea42d3aaeac4, + type: 3} + propertyPath: m_SortingOrder + value: -16 + objectReference: {fileID: 0} + - target: {fileID: 6862985689332339068, guid: ddf71bfb72c45407fb8cea42d3aaeac4, + type: 3} + propertyPath: m_LocalPosition.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6865356856506463216, guid: ddf71bfb72c45407fb8cea42d3aaeac4, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 8066748594655780890, guid: ddf71bfb72c45407fb8cea42d3aaeac4, + type: 3} + propertyPath: _viewpoint + value: + objectReference: {fileID: 1277973436} + - target: {fileID: 8066748594655780890, guid: ddf71bfb72c45407fb8cea42d3aaeac4, + type: 3} + propertyPath: _primaryLight + value: + objectReference: {fileID: 1534715615} + - target: {fileID: 8463273387121746137, guid: ddf71bfb72c45407fb8cea42d3aaeac4, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8463273387121746142, guid: ddf71bfb72c45407fb8cea42d3aaeac4, + type: 3} + propertyPath: m_NormalizedViewPortRect.width + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8463273387121746142, guid: ddf71bfb72c45407fb8cea42d3aaeac4, + type: 3} + propertyPath: m_CullingMask.m_Bits + value: 823 objectReference: {fileID: 0} - target: {fileID: 9037604615445586465, guid: ddf71bfb72c45407fb8cea42d3aaeac4, type: 3} @@ -179,5 +310,303 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9037604615445586478, guid: ddf71bfb72c45407fb8cea42d3aaeac4, + type: 3} + propertyPath: m_Name + value: MainScene + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ddf71bfb72c45407fb8cea42d3aaeac4, type: 3} +--- !u!4 &1277973436 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8463273387121746141, guid: ddf71bfb72c45407fb8cea42d3aaeac4, + type: 3} + m_PrefabInstance: {fileID: 1030721467} + m_PrefabAsset: {fileID: 0} +--- !u!108 &1534715615 stripped +Light: + m_CorrespondingSourceObject: {fileID: 5936606776992183399, guid: ddf71bfb72c45407fb8cea42d3aaeac4, + type: 3} + m_PrefabInstance: {fileID: 1030721467} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1691304087 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2452750316707852747, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + m_PrefabInstance: {fileID: 1862824156} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1691304088 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2452750316707852748, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + m_PrefabInstance: {fileID: 1862824156} + m_PrefabAsset: {fileID: 0} +--- !u!20 &1691304089 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 2452750316707852751, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + m_PrefabInstance: {fileID: 1862824156} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1691304090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691304087} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2c593ea1d4904804b05ef10faba0af2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1862824156 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 253380425} + m_Modifications: + - target: {fileID: 2452750316707852744, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852747, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_Name + value: DemoCamera (1) + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_LocalPosition.x + value: 42 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.008222009 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.6862176 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.007757488 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7273085 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852749, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852751, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: near clip plane + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852751, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_NormalizedViewPortRect.width + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852751, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_NormalizedViewPortRect.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852751, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_CullingMask.m_Bits + value: 1831 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cada5253abff1481b98c0880eb065d8e, type: 3} +--- !u!1001 &2083190839 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1691304088} + m_Modifications: + - target: {fileID: 1648640012831910, guid: 1ab0847a8e46b4c4fa728256231f88eb, type: 3} + propertyPath: m_Name + value: UnderWaterCurtainGeom + objectReference: {fileID: 0} + - target: {fileID: 1648640012831910, guid: 1ab0847a8e46b4c4fa728256231f88eb, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 4720579618361426, guid: 1ab0847a8e46b4c4fa728256231f88eb, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4720579618361426, guid: 1ab0847a8e46b4c4fa728256231f88eb, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4720579618361426, guid: 1ab0847a8e46b4c4fa728256231f88eb, type: 3} + propertyPath: m_LocalPosition.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4720579618361426, guid: 1ab0847a8e46b4c4fa728256231f88eb, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4720579618361426, guid: 1ab0847a8e46b4c4fa728256231f88eb, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4720579618361426, guid: 1ab0847a8e46b4c4fa728256231f88eb, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4720579618361426, guid: 1ab0847a8e46b4c4fa728256231f88eb, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4720579618361426, guid: 1ab0847a8e46b4c4fa728256231f88eb, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4720579618361426, guid: 1ab0847a8e46b4c4fa728256231f88eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4720579618361426, guid: 1ab0847a8e46b4c4fa728256231f88eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4720579618361426, guid: 1ab0847a8e46b4c4fa728256231f88eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 23363507218070258, guid: 1ab0847a8e46b4c4fa728256231f88eb, + type: 3} + propertyPath: m_SortingOrder + value: -16 + objectReference: {fileID: 0} + - target: {fileID: 33478687144416888, guid: 1ab0847a8e46b4c4fa728256231f88eb, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 114136469499409476, guid: 1ab0847a8e46b4c4fa728256231f88eb, + type: 3} + propertyPath: _camera + value: + objectReference: {fileID: 1691304089} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1ab0847a8e46b4c4fa728256231f88eb, type: 3} +--- !u!1 &2139455144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2139455145} + - component: {fileID: 2139455146} + m_Layer: 4 + m_Name: Ocean (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2139455145 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2139455144} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 253380425} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2139455146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2139455144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dde37eff0f7685f41902f400d1de0c6c, type: 3} + m_Name: + m_EditorClassIdentifier: + _viewpoint: {fileID: 1691304088} + _timeProvider: {fileID: 0} + _primaryLight: {fileID: 1534715615} + _searchForPrimaryLightOnStartup: 1 + _material: {fileID: 2100000, guid: ef94c26e44a36e24a9dcbc5995a2bed1, type: 2} + _layerName: Water 2 + _gravityMultiplier: 1 + _minTexelsPerWave: 3 + _minScale: 4 + _maxScale: 256 + _dropDetailHeightBasedOnWaves: 0.2 + _lodDataResolution: 384 + _geometryDownSampleFactor: 4 + _lodCount: 7 + _simSettingsAnimatedWaves: {fileID: 0} + _createSeaFloorDepthData: 1 + _createFoamSim: 1 + _simSettingsFoam: {fileID: 0} + _createDynamicWaveSim: 0 + _simSettingsDynamicWaves: {fileID: 0} + _createFlowSim: 0 + _simSettingsFlow: {fileID: 0} + _createShadowData: 1 + _simSettingsShadow: {fileID: 0} + _createClipSurfaceData: 1 + _defaultClippingState: 0 + _showOceanProxyPlane: 0 + _editModeFPS: 30 + _followSceneCamera: 1 + _attachDebugGUI: 1 + _hideOceanTileGameObjects: 1 + _uniformTiles: 0 + _disableSkirt: 0 diff --git a/crest/ProjectSettings/TagManager.asset b/crest/ProjectSettings/TagManager.asset index c019be115a..b325d5d41f 100644 --- a/crest/ProjectSettings/TagManager.asset +++ b/crest/ProjectSettings/TagManager.asset @@ -16,7 +16,7 @@ TagManager: - - PostProcessing - Terrain - - + - Water 2 - - -