diff --git a/.gitattributes b/.gitattributes index d2fc101e8..056566303 100644 --- a/.gitattributes +++ b/.gitattributes @@ -71,3 +71,4 @@ *.csproj text *.asmdef text *.sbs filter=lfs diff=lfs merge=lfs -text +*.bytes filter=lfs diff=lfs merge=lfs -text diff --git a/Assets/Samples/Shader Graph/17.1.0/Feature Examples/Scenes/HDRPFeatureExampleScene/HDRPFeatureExampleScene Baking Set.asset b/Assets/Samples/Shader Graph/17.1.0/Feature Examples/Scenes/HDRPFeatureExampleScene/HDRPFeatureExampleScene Baking Set.asset index 9c750a13c..d00c47fb4 100644 --- a/Assets/Samples/Shader Graph/17.1.0/Feature Examples/Scenes/HDRPFeatureExampleScene/HDRPFeatureExampleScene Baking Set.asset +++ b/Assets/Samples/Shader Graph/17.1.0/Feature Examples/Scenes/HDRPFeatureExampleScene/HDRPFeatureExampleScene Baking Set.asset @@ -1,108 +1,3 @@ -%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: 4881f9a2c4d568047b316028d20a8dca, type: 3} - m_Name: HDRPFeatureExampleScene Baking Set - m_EditorClassIdentifier: - singleSceneMode: 1 - dialogNoProbeVolumeInSetShown: 1 - settings: - m_Version: 1 - dilationSettings: - enableDilation: 1 - dilationDistance: 1 - dilationValidityThreshold: 0.25 - dilationIterations: 1 - squaredDistWeighting: 1 - virtualOffsetSettings: - useVirtualOffset: 1 - outOfGeoOffset: 0.01 - searchMultiplier: 0.2 - rayOriginBias: -0.001 - collisionMask: - serializedVersion: 2 - m_Bits: 4294967291 - m_SceneGUIDs: - - 5df51740932cb494b90e48546dc6fd00 - scenesToNotBake: [] - m_LightingScenarios: - - Default - cellDescs: - m_Keys: - m_Values: [] - m_SerializedPerSceneCellList: [] - cellSharedDataAsset: - m_AssetGUID: c6530ff73c1747e4ea5afee2bb30f35b - m_StreamableAssetPath: APVStreamingAssets\54e66fbe6aab26e4f8f1a9201913e0d0\c6530ff73c1747e4ea5afee2bb30f35b.bytes - m_ElementSize: 8192 - m_StreamableCellDescs: - m_Keys: - m_Values: [] - scenarios: - m_Keys: - - Default - m_Values: - - sceneHash: -1190771457 - cellDataAsset: - m_AssetGUID: 39f432c3f3640ba42bb92cc66295fdf8 - m_StreamableAssetPath: APVStreamingAssets\54e66fbe6aab26e4f8f1a9201913e0d0\39f432c3f3640ba42bb92cc66295fdf8.bytes - m_ElementSize: 131072 - m_StreamableCellDescs: - m_Keys: - m_Values: [] - cellOptionalDataAsset: - m_AssetGUID: 90fd0ab735c58d74eaf308ac7d0ef74f - m_StreamableAssetPath: APVStreamingAssets\54e66fbe6aab26e4f8f1a9201913e0d0\90fd0ab735c58d74eaf308ac7d0ef74f.bytes - m_ElementSize: 131072 - m_StreamableCellDescs: - m_Keys: - m_Values: [] - cellBricksDataAsset: - m_AssetGUID: fa80a9ee17cf1b547906bd566fbad53f - m_StreamableAssetPath: APVStreamingAssets\54e66fbe6aab26e4f8f1a9201913e0d0\fa80a9ee17cf1b547906bd566fbad53f.bytes - m_ElementSize: 16 - m_StreamableCellDescs: - m_Keys: - m_Values: [] - cellSupportDataAsset: - m_AssetGUID: 61b9205d9fb7a094facf4335e32f74c1 - m_StreamableAssetPath: APVStreamingAssets\54e66fbe6aab26e4f8f1a9201913e0d0\61b9205d9fb7a094facf4335e32f74c1.bytes - m_ElementSize: 262144 - m_StreamableCellDescs: - m_Keys: - m_Values: [] - chunkSizeInBricks: 128 - maxCellPosition: {x: 0, y: 0, z: 0} - minCellPosition: {x: -1, y: -1, z: -1} - globalBounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 81, y: 81, z: 81} - bakedSimplificationLevels: 3 - bakedMinDistanceBetweenProbes: 1 - maxSHChunkCount: -1 - L0ChunkSize: 65536 - L1ChunkSize: 32768 - L2TextureChunkSize: 32768 - validityMaskChunkSize: 8192 - supportPositionChunkSize: 98304 - supportValidityChunkSize: 32768 - supportTouchupChunkSize: 32768 - supportOffsetsChunkSize: 98304 - supportDataChunkSize: 262144 - lightingScenario: Default - version: 0 - freezePlacement: 0 - simplificationLevels: 3 - minDistanceBetweenProbes: 1 - renderersLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - minRendererVolumeSize: 0.1 +version https://git-lfs.github.com/spec/v1 +oid sha256:0168813a0506d91d3dc52b55a46fbcfd2d87c956e76ba531790bf78cdde4abf8 +size 3355 diff --git a/Assets/Samples/Shader Graph/17.1.0/Production Ready Shaders/Scenes/HDRPProductionReadyShaders/HDRPProductionReadyShaders Baking Set.asset b/Assets/Samples/Shader Graph/17.1.0/Production Ready Shaders/Scenes/HDRPProductionReadyShaders/HDRPProductionReadyShaders Baking Set.asset index 5b629abfa..9a755c3d8 100644 --- a/Assets/Samples/Shader Graph/17.1.0/Production Ready Shaders/Scenes/HDRPProductionReadyShaders/HDRPProductionReadyShaders Baking Set.asset +++ b/Assets/Samples/Shader Graph/17.1.0/Production Ready Shaders/Scenes/HDRPProductionReadyShaders/HDRPProductionReadyShaders Baking Set.asset @@ -1,118 +1,3 @@ -%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: 4881f9a2c4d568047b316028d20a8dca, type: 3} - m_Name: HDRPProductionReadyShaders Baking Set - m_EditorClassIdentifier: - singleSceneMode: 1 - dialogNoProbeVolumeInSetShown: 1 - settings: - m_Version: 1 - dilationSettings: - enableDilation: 1 - dilationDistance: 1 - dilationValidityThreshold: 0.25 - dilationIterations: 1 - squaredDistWeighting: 1 - virtualOffsetSettings: - useVirtualOffset: 1 - validityThreshold: 0.25 - outOfGeoOffset: 0.01 - searchMultiplier: 0.2 - rayOriginBias: -0.001 - collisionMask: - serializedVersion: 2 - m_Bits: 4294967291 - m_SceneGUIDs: - - 222cbbe63659e844187ee4988f93e660 - obsoleteScenesToNotBake: [] - m_LightingScenarios: - - Default - cellDescs: - m_Keys: - m_Values: [] - m_SerializedPerSceneCellList: [] - cellSharedDataAsset: - m_AssetGUID: - m_StreamableAssetPath: - m_ElementSize: 0 - m_StreamableCellDescs: - m_Keys: - m_Values: [] - m_Asset: {fileID: 0} - scenarios: - m_Keys: [] - m_Values: [] - cellBricksDataAsset: - m_AssetGUID: - m_StreamableAssetPath: - m_ElementSize: 0 - m_StreamableCellDescs: - m_Keys: - m_Values: [] - m_Asset: {fileID: 0} - cellSupportDataAsset: - m_AssetGUID: - m_StreamableAssetPath: - m_ElementSize: 0 - m_StreamableCellDescs: - m_Keys: - m_Values: [] - m_Asset: {fileID: 0} - chunkSizeInBricks: 128 - maxCellPosition: {x: 0, y: 0, z: 0} - minCellPosition: {x: 0, y: 0, z: 0} - globalBounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - bakedSimplificationLevels: 3 - bakedMinDistanceBetweenProbes: 1 - bakedSkyOcclusionValue: 0 - bakedSkyShadingDirectionValue: 0 - bakedProbeOffset: {x: 0, y: 0, z: 0} - maxSHChunkCount: -1 - L0ChunkSize: 0 - L1ChunkSize: 0 - L2TextureChunkSize: 0 - sharedValidityMaskChunkSize: 8192 - sharedSkyOcclusionL0L1ChunkSize: 0 - sharedSkyShadingDirectionIndicesChunkSize: 0 - sharedDataChunkSize: 0 - supportPositionChunkSize: 0 - supportValidityChunkSize: 0 - supportTouchupChunkSize: 0 - supportOffsetsChunkSize: 0 - supportDataChunkSize: 0 - lightingScenario: Default - version: 1 - freezePlacement: 0 - probeOffset: {x: 0, y: 0, z: 0} - simplificationLevels: 3 - minDistanceBetweenProbes: 1 - renderersLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - minRendererVolumeSize: 0.1 - skyOcclusion: 0 - skyOcclusionBakingSamples: 2048 - skyOcclusionBakingBounces: 2 - skyOcclusionAverageAlbedo: 0.6 - skyOcclusionBackFaceCulling: 0 - skyOcclusionShadingDirection: 0 - m_SceneBakeData: - m_Keys: - - 222cbbe63659e844187ee4988f93e660 - m_Values: - - hasProbeVolume: 0 - bakeScene: 1 - bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} +version https://git-lfs.github.com/spec/v1 +oid sha256:dfc4f141abe7db8b05407ac2768dc9569417b955b850d39eabb7d7f10071978d +size 3061 diff --git a/Assets/Settings/PC_RPAsset.asset b/Assets/Settings/PC_RPAsset.asset index 7c5fded4b..4c4734602 100644 --- a/Assets/Settings/PC_RPAsset.asset +++ b/Assets/Settings/PC_RPAsset.asset @@ -1,138 +1,3 @@ -%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: bf2edee5c58d82540a51f03df9d42094, type: 3} - m_Name: PC_RPAsset - m_EditorClassIdentifier: - k_AssetVersion: 12 - k_AssetPreviousVersion: 12 - m_RendererType: 1 - m_RendererData: {fileID: 0} - m_RendererDataList: - - {fileID: 11400000, guid: f288ae1f4751b564a96ac7587541f7a2, type: 2} - m_DefaultRendererIndex: 0 - m_RequireDepthTexture: 1 - m_RequireOpaqueTexture: 1 - m_OpaqueDownsampling: 1 - m_SupportsTerrainHoles: 1 - m_SupportsHDR: 1 - m_HDRColorBufferPrecision: 0 - m_MSAA: 1 - m_RenderScale: 1 - m_UpscalingFilter: 0 - m_FsrOverrideSharpness: 0 - m_FsrSharpness: 0.92 - m_EnableLODCrossFade: 1 - m_LODCrossFadeDitheringType: 1 - m_ShEvalMode: 0 - m_LightProbeSystem: 0 - m_ProbeVolumeMemoryBudget: 1024 - m_ProbeVolumeBlendingMemoryBudget: 256 - m_SupportProbeVolumeGPUStreaming: 0 - m_SupportProbeVolumeDiskStreaming: 0 - m_SupportProbeVolumeScenarios: 0 - m_SupportProbeVolumeScenarioBlending: 0 - m_ProbeVolumeSHBands: 1 - m_MainLightRenderingMode: 1 - m_MainLightShadowsSupported: 1 - m_MainLightShadowmapResolution: 2048 - m_AdditionalLightsRenderingMode: 1 - m_AdditionalLightsPerObjectLimit: 8 - m_AdditionalLightShadowsSupported: 1 - m_AdditionalLightsShadowmapResolution: 4096 - m_AdditionalLightsShadowResolutionTierLow: 256 - m_AdditionalLightsShadowResolutionTierMedium: 512 - m_AdditionalLightsShadowResolutionTierHigh: 1024 - m_ReflectionProbeBlending: 1 - m_ReflectionProbeBoxProjection: 1 - m_ReflectionProbeAtlas: 1 - m_ShadowDistance: 50 - m_ShadowCascadeCount: 1 - m_Cascade2Split: 0.25 - m_Cascade3Split: {x: 0.1, y: 0.3} - m_Cascade4Split: {x: 0.12299999, y: 0.2926, z: 0.53599995} - m_CascadeBorder: 0 - m_ShadowDepthBias: 0.1 - m_ShadowNormalBias: 0.5 - m_AnyShadowsSupported: 1 - m_SoftShadowsSupported: 1 - m_ConservativeEnclosingSphere: 1 - m_NumIterationsEnclosingSphere: 64 - m_SoftShadowQuality: 3 - m_AdditionalLightsCookieResolution: 2048 - m_AdditionalLightsCookieFormat: 3 - m_UseSRPBatcher: 1 - m_SupportsDynamicBatching: 0 - m_MixedLightingSupported: 1 - m_SupportsLightCookies: 1 - m_SupportsLightLayers: 1 - m_DebugLevel: 0 - m_StoreActionsOptimization: 0 - m_UseAdaptivePerformance: 1 - m_ColorGradingMode: 1 - m_ColorGradingLutSize: 32 - m_AllowPostProcessAlphaOutput: 0 - m_UseFastSRGBLinearConversion: 0 - m_SupportDataDrivenLensFlare: 1 - m_SupportScreenSpaceLensFlare: 1 - m_GPUResidentDrawerMode: 0 - m_SmallMeshScreenPercentage: 0 - m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0 - m_ShadowType: 1 - m_LocalShadowsSupported: 0 - m_LocalShadowsAtlasResolution: 256 - m_MaxPixelLights: 0 - m_ShadowAtlasResolution: 256 - m_VolumeFrameworkUpdateMode: 0 - m_VolumeProfile: {fileID: 11400000, guid: 10fc4df2da32a41aaa32d77bc913491c, type: 2} - apvScenesData: - obsoleteSceneBounds: - m_Keys: [] - m_Values: [] - obsoleteHasProbeVolumes: - m_Keys: [] - m_Values: - m_PrefilteringModeMainLightShadows: 3 - m_PrefilteringModeAdditionalLight: 0 - m_PrefilteringModeAdditionalLightShadows: 2 - m_PrefilterXRKeywords: 1 - m_PrefilteringModeForwardPlus: 2 - m_PrefilteringModeDeferredRendering: 0 - m_PrefilteringModeScreenSpaceOcclusion: 2 - m_PrefilterDebugKeywords: 1 - m_PrefilterWriteRenderingLayers: 1 - m_PrefilterHDROutput: 1 - m_PrefilterAlphaOutput: 1 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 1 - m_PrefilterSSAOSourceDepthMedium: 1 - m_PrefilterSSAOSourceDepthHigh: 1 - m_PrefilterSSAOInterleaved: 1 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 1 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 1 - m_PrefilterDBufferMRT1: 1 - m_PrefilterDBufferMRT2: 1 - m_PrefilterDBufferMRT3: 1 - m_PrefilterSoftShadowsQualityLow: 1 - m_PrefilterSoftShadowsQualityMedium: 1 - m_PrefilterSoftShadowsQualityHigh: 1 - m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 1 - m_PrefilterNativeRenderPass: 1 - m_PrefilterUseLegacyLightmaps: 0 - m_PrefilterBicubicLightmapSampling: 1 - m_ShaderVariantLogLevel: 0 - m_ShadowCascades: 0 - m_Textures: - blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} - bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} +version https://git-lfs.github.com/spec/v1 +oid sha256:50364e93a4b8f4e8f7c02755375b3deffd53e1bd8ff72225a486b63eb04afdfa +size 4455 diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index fa21f6423..cb8b6f764 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -1,166 +1,3 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-8459026560591830105 -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: 6b3d386ba5cd94485973aee1479b272e, type: 3} - m_Name: Prop - m_EditorClassIdentifier: - m_Active: 1 - settings: - passTag: Prop - Event: 300 - filterSettings: - RenderQueueType: 0 - LayerMask: - serializedVersion: 2 - m_Bits: 128 - PassNames: [] - overrideMaterial: {fileID: 0} - overrideMaterialPassIndex: 0 - overrideShader: {fileID: 0} - overrideShaderPassIndex: 0 - overrideMode: 1 - overrideDepthState: 1 - depthCompareFunction: 4 - enableWrite: 1 - stencilSettings: - overrideStencilState: 0 - stencilReference: 0 - stencilCompareFunction: 8 - passOperation: 0 - failOperation: 0 - zFailOperation: 0 - cameraSettings: - overrideCamera: 0 - restoreCamera: 1 - offset: {x: 0, y: 0, z: 0, w: 0} - cameraFieldOfView: 60 ---- !u!114 &-5955598209606857498 -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: 6b3d386ba5cd94485973aee1479b272e, type: 3} - m_Name: HighlightPlayer - m_EditorClassIdentifier: - m_Active: 1 - settings: - passTag: HighlightPlayer - Event: 300 - filterSettings: - RenderQueueType: 1 - LayerMask: - serializedVersion: 2 - m_Bits: 64 - PassNames: [] - overrideMaterial: {fileID: 2100000, guid: cf27ba16f44ba467783164c3319de3cc, type: 2} - overrideMaterialPassIndex: 0 - overrideShader: {fileID: 0} - overrideShaderPassIndex: 0 - overrideMode: 1 - overrideDepthState: 1 - depthCompareFunction: 5 - enableWrite: 0 - stencilSettings: - overrideStencilState: 0 - stencilReference: 1 - stencilCompareFunction: 7 - passOperation: 2 - failOperation: 0 - zFailOperation: 0 - cameraSettings: - overrideCamera: 0 - restoreCamera: 1 - offset: {x: 0, y: 0, z: 0, w: 0} - cameraFieldOfView: 60 ---- !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: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} - m_Name: PC_Renderer - m_EditorClassIdentifier: - debugShaders: - debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} - hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} - probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3} - probeVolumeResources: - probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae, type: 3} - probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607, type: 3} - probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664, type: 3} - probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7, type: 3} - probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe, type: 3} - probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, type: 3} - probeVolumeBlendStatesCS: {fileID: 7200000, guid: b9a23f869c4fd45f19c5ada54dd82176, type: 3} - m_RendererFeatures: - - {fileID: 7833122117494664109} - - {fileID: -5955598209606857498} - - {fileID: -8459026560591830105} - m_RendererFeatureMap: ad6b866f10d7b46ce64c6e83fb7659ada763543629809b8a - m_UseNativeRenderPass: 1 - xrSystemData: {fileID: 0} - postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} - m_AssetVersion: 2 - m_OpaqueLayerMask: - serializedVersion: 2 - m_Bits: 895 - m_TransparentLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_DefaultStencilState: - overrideStencilState: 0 - stencilReference: 1 - stencilCompareFunction: 3 - passOperation: 2 - failOperation: 0 - zFailOperation: 0 - m_ShadowTransparentReceive: 1 - m_RenderingMode: 1 - m_DepthPrimingMode: 0 - m_CopyDepthMode: 0 - m_DepthAttachmentFormat: 0 - m_DepthTextureFormat: 0 - m_AccurateGbufferNormals: 0 - m_IntermediateTextureMode: 0 ---- !u!114 &7833122117494664109 -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: f62c9c65cf3354c93be831c8bc075510, type: 3} - m_Name: ScreenSpaceAmbientOcclusion - m_EditorClassIdentifier: - m_Active: 1 - m_Settings: - AOMethod: 0 - Downsample: 0 - AfterOpaque: 0 - Source: 1 - NormalSamples: 1 - Intensity: 0.4 - DirectLightingStrength: 0.25 - Radius: 0.3 - Samples: 1 - BlurQuality: 0 - Falloff: 100 - SampleCount: -1 +version https://git-lfs.github.com/spec/v1 +oid sha256:d3d94f40456ea85cdaa3cf04c9ffdb7eee4aad4501ad610b0cada66a00fc208a +size 5224 diff --git a/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph b/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph index b66c5b6ed..ce7e1904b 100644 --- a/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph +++ b/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph @@ -252,6 +252,15 @@ }, { "m_Id": "dd5f3c032f5e4d628f2fd217aff9014f" + }, + { + "m_Id": "9ea7841f7742473eac1d80cc97d2726c" + }, + { + "m_Id": "4d1430013dcb4815a91820d9d840532e" + }, + { + "m_Id": "c2aac6b4cbdb4350a02fdebd568e2de7" } ], "m_GroupDatas": [ @@ -484,6 +493,20 @@ "m_SlotId": -91790554 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "4d1430013dcb4815a91820d9d840532e" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c2aac6b4cbdb4350a02fdebd568e2de7" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -647,7 +670,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "f913165a0168454a83d6f1ebe45f2604" + "m_Id": "c2aac6b4cbdb4350a02fdebd568e2de7" }, "m_SlotId": 0 } @@ -736,6 +759,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "9ea7841f7742473eac1d80cc97d2726c" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4d1430013dcb4815a91820d9d840532e" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -792,6 +829,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c2aac6b4cbdb4350a02fdebd568e2de7" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "f913165a0168454a83d6f1ebe45f2604" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -960,6 +1011,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "fe14a7ba65b24516a6dc92571c6ecd71" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4d1430013dcb4815a91820d9d840532e" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1647,6 +1712,78 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "1480d09f50f145a9859a4574f80e196a", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "1513c5ccddac41a0840554b29b159cd4", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", @@ -1871,13 +2008,13 @@ "m_Id": "65b8adaa035f432688ba9f42d9595d47" }, "m_AllowMaterialOverride": true, - "m_SurfaceType": 0, + "m_SurfaceType": 1, "m_ZTestMode": 4, "m_ZWriteControl": 0, "m_AlphaMode": 0, - "m_RenderFace": 2, + "m_RenderFace": 0, "m_AlphaClip": true, - "m_CastShadows": true, + "m_CastShadows": false, "m_ReceiveShadows": true, "m_DisableTint": false, "m_AdditionalMotionVectorMode": 0, @@ -2384,6 +2521,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "366f415ff8104c1683e67cf011cb48fb", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -2814,6 +2999,49 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "4d1430013dcb4815a91820d9d840532e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 383.0000305175781, + "y": 171.00003051757813, + "width": 207.99996948242188, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "1480d09f50f145a9859a4574f80e196a" + }, + { + "m_Id": "63edd4f1bd7f45a4a5ce57479d6f971d" + }, + { + "m_Id": "366f415ff8104c1683e67cf011cb48fb" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty", @@ -2837,6 +3065,28 @@ "m_Value": true } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "4f3c27761cb640edbb2e54c3eb43211a", + "m_Id": 3, + "m_DisplayName": "StaticUV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "StaticUV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 1 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2922,6 +3172,28 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "541fdb5e6f1844edbb8f15a1740e5e1e", + "m_Id": 4, + "m_DisplayName": "DynamicUV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "DynamicUV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 2 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", @@ -3244,6 +3516,54 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "63edd4f1bd7f45a4a5ce57479d6f971d", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", @@ -3309,6 +3629,30 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "6986061a431d47a6865411a0e49ff27f", + "m_Id": 0, + "m_DisplayName": "NormalWS", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "NormalWS", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 2 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4553,6 +4897,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BakedGINode", + "m_ObjectId": "9ea7841f7742473eac1d80cc97d2726c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Baked GI", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 237.0, + "y": 453.9999694824219, + "width": 183.0001220703125, + "height": 184.00003051757813 + } + }, + "m_Slots": [ + { + "m_Id": "6986061a431d47a6865411a0e49ff27f" + }, + { + "m_Id": "c6b4eba608674e54b16494324f632570" + }, + { + "m_Id": "4f3c27761cb640edbb2e54c3eb43211a" + }, + { + "m_Id": "541fdb5e6f1844edbb8f15a1740e5e1e" + }, + { + "m_Id": "ea47e21b9fa5437883564b98c0533939" + } + ], + "synonyms": [ + "global illumination" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_ApplyScaling": true +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5142,6 +5534,30 @@ "m_SerializedDescriptor": "SurfaceDescription.Specular" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "c128a1a0c45a40ff8b5e695c9661e07f", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", @@ -5198,6 +5614,49 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "c2aac6b4cbdb4350a02fdebd568e2de7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 644.0, + "y": 171.00003051757813, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "c128a1a0c45a40ff8b5e695c9661e07f" + }, + { + "m_Id": "1513c5ccddac41a0840554b29b159cd4" + }, + { + "m_Id": "d40d8cf82b3346f5bcaabfe77c8239c7" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5250,6 +5709,30 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "c6b4eba608674e54b16494324f632570", + "m_Id": 2, + "m_DisplayName": "PositionWS", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "PositionWS", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 2 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5645,6 +6128,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "d40d8cf82b3346f5bcaabfe77c8239c7", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -6093,6 +6600,29 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "ea47e21b9fa5437883564b98c0533939", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", diff --git a/Assets/_DDD/Rendering/Restaurant-Default-Medium.giparams b/Assets/_DDD/Rendering/Restaurant-Default-Medium.giparams new file mode 100644 index 000000000..66b1961f6 --- /dev/null +++ b/Assets/_DDD/Rendering/Restaurant-Default-Medium.giparams @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1113 &111300000 +LightmapParameters: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Restaurant-Default-Medium + serializedVersion: 4 + resolution: 1 + clusterResolution: 0.5 + irradianceBudget: 128 + irradianceQuality: 8192 + backFaceTolerance: 0.9 + isTransparent: 1 + modellingTolerance: 0.01 + systemTag: -1 + edgeStitching: 1 + blurRadius: 2 + directLightQuality: 64 + antiAliasingSamples: 2 + pushoff: 0.0001 + bakedLightmapTag: -1 + limitLightmapCount: 0 + maxLightmapCount: 1 + AOQuality: 256 + AOAntiAliasingSamples: 4 diff --git a/Assets/_DDD/Rendering/Restaurant-Default-Medium.giparams.meta b/Assets/_DDD/Rendering/Restaurant-Default-Medium.giparams.meta new file mode 100644 index 000000000..9ab3313d9 --- /dev/null +++ b/Assets/_DDD/Rendering/Restaurant-Default-Medium.giparams.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa47ee96e18564138aa87207777daca2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 111300000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/Rendering/RestaurantLightingSettings.lighting b/Assets/_DDD/Rendering/RestaurantLightingSettings.lighting index 75537043d..a0e2b072f 100644 --- a/Assets/_DDD/Rendering/RestaurantLightingSettings.lighting +++ b/Assets/_DDD/Rendering/RestaurantLightingSettings.lighting @@ -9,12 +9,12 @@ LightingSettings: m_Name: RestaurantLightingSettings serializedVersion: 9 m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 1 + m_EnableRealtimeLightmaps: 0 m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 m_IndirectOutputScale: 1 - m_UsingShadowmask: 1 + m_UsingShadowmask: 0 m_BakeBackend: 2 m_LightmapMaxSize: 1024 m_LightmapSizeFixed: 0 @@ -22,15 +22,15 @@ LightingSettings: m_BakeResolution: 40 m_Padding: 2 m_LightmapCompression: 3 - m_AO: 0 + m_AO: 1 m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 m_ExtractAO: 0 - m_MixedBakeMode: 2 + m_MixedBakeMode: 0 m_LightmapsBakeMode: 1 m_FilterMode: 1 - m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_LightmapParameters: {fileID: 111300000, guid: aa47ee96e18564138aa87207777daca2, type: 2} m_ExportTrainingData: 0 m_EnableWorkerProcessBaking: 1 m_TrainingDataDestination: TrainingData diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/LightingData.asset b/Assets/_DDD/_Addressables/Scenes/Restaurant/LightingData.asset index 1e38622d1..b34445ae0 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/LightingData.asset +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/LightingData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06af11e353835bd6ed1995673adb2559ecccb7ceabb083607407d10558253213 -size 3882964 +oid sha256:82dcc695096adb8d0bdb5ab22339e833ca714d91435a171c2d50a089c1891b88 +size 29857 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_dir.png index 90a300861..fa945c118 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0df32236e07556e99f7a37c74c82cf60bac7bac7692bdd2edc50a755075c4a28 -size 41737 +oid sha256:022aa44cf18b62d8cb3574089047b87fd8d7cc9b52415242badd2540b331e0a7 +size 227354 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_light.exr index f81b657e0..1e74b16a4 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e71b3ad44fccf168228c1d88fbcd3efc722e7da4eeff0889294d3652f8ee8ab -size 722402 +oid sha256:644bd9c1f7341aef35daed7ab54b039b422ee64fa1eb9f32e68191b5b9d2b383 +size 4184975 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_dir.png index 0f04b7c4e..c7fff91e4 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c1b33c821a9dec7805772abcd537badb51a4ca61d94fe53600381645e9fe43e -size 92519 +oid sha256:215bb1e3c0e45aeaba8630be8e7858dfa762756c2ba9aab9c6612bfec604b48d +size 537295 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_light.exr index 1a141a4c3..735cd3e29 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f790ad8538a10acfa265b8b2d337c777537836bb55151d9e921ba99e993473d -size 1612913 +oid sha256:4d5b567f6ab1d060a2b02651f9b18193191092b09027b05f4f2e4b0c7e0c6f70 +size 9574644 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_dir.png index bed45164a..ff3ba74fb 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be007d08216de059c0659db4a0a052916e8a8d673ce943e82ec5e23026e599ae -size 77844 +oid sha256:3f20d0c848b70887c25c6a38059d895170a9481d1a37e8fd76052374d7699f2f +size 745273 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_light.exr index aa91270d8..0826857d0 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5413656c28e5125ad01d3b3fbbdbc9c51dc320529426c1df677b600e9802e1e7 -size 1778240 +oid sha256:55b51fa5c8cef1b4e14f50bab37e863f89ba33324e6f95f67ca36631fadeb67a +size 11803586 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_dir.png index 31c91af6d..171a86018 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac564f75e1ee107b7ca0dca9b3416f91f45ff188f2fd846ebbbbc43034a4f5a6 -size 43334 +oid sha256:6c2f80b1a6df95a69d52089e3d37f6ad4962b3e38d80f9846423fdcf89306ec4 +size 487047 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_light.exr index 503414b39..82f74434e 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3df82d3e69f9e15dbd869604862fb8a980d9c5d8f85bcfd9efdb57394be56d45 -size 1512718 +oid sha256:77e02c14664b51236582bd3b585c8b85729fd9b8cc34708565d09ff60a66c18b +size 7832853 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_dir.png index 47fd62ab7..fa172aed1 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2838fcf564e2078ae545896a3962229dd5b751d996c1a3ae9bc308b3ddc57952 -size 28392 +oid sha256:99297166f913f2282b4bffb1c9b5d9d72c3e263bc12cb8dc196242c0b15a1300 +size 50330 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_light.exr index 4f0dab61d..4fe1c88e3 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2b3eb44045656a5d4f577b2d28c03193f835086685df66f59c16c1df5400903 -size 430637 +oid sha256:3faee729ba7a09dcfcb261dfb12c7daa6488d807f193fdd1812f643ea0dbe8ce +size 737909 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/ReflectionProbe-0.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/ReflectionProbe-0.exr index 599d95005..9bd5e3b96 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/ReflectionProbe-0.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/ReflectionProbe-0.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c695af6d93e207b15dd4ccd47595315deb30511ffe7694e1021c707267b56d8 -size 169246 +oid sha256:b29b67f0334c3bb817d6b3be797d9c551f58e8db3058ade3dbeb0ddf2c74ba3f +size 100899 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellData.bytes new file mode 100644 index 000000000..f27388fdf --- /dev/null +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellData.bytes @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7bdfbe3af83cef7a1ffc468a404e87a25380bea232140d8debc177024938867 +size 262144 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellData.bytes.meta b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellData.bytes.meta new file mode 100644 index 000000000..58afdcf41 --- /dev/null +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellData.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1d3b94e71dbbd46f1ad36da1dae75b72 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellOptionalData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellOptionalData.bytes new file mode 100644 index 000000000..0ef4ca58c --- /dev/null +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellOptionalData.bytes @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4937e47affd56b29576e2070bc262abc3441c658bd7df9f3fa544297644e237a +size 262144 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellOptionalData.bytes.meta b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellOptionalData.bytes.meta new file mode 100644 index 000000000..7e36f7686 --- /dev/null +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellOptionalData.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6f851ce14c20f4cf6a14e8d3ec7ea4e9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellProbeOcclusionData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellProbeOcclusionData.bytes new file mode 100644 index 000000000..c0c232e5e --- /dev/null +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellProbeOcclusionData.bytes @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f2b254c1ef0e2fa52c741bb5e3d709a3fe177532aff510d9c23e0f3ef32a1f1 +size 1310720 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellProbeOcclusionData.bytes.meta b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellProbeOcclusionData.bytes.meta new file mode 100644 index 000000000..9c7cbebbd --- /dev/null +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellProbeOcclusionData.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 393521200cd8141a6b98845417ecdad3 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellBricksData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellBricksData.bytes new file mode 100644 index 000000000..3bf7cc671 --- /dev/null +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellBricksData.bytes @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd261e7861addcff9ead87ca048c0f07089a6b0f70017389feb83540b85f0237 +size 3520 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellBricksData.bytes.meta b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellBricksData.bytes.meta new file mode 100644 index 000000000..482e38a4c --- /dev/null +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellBricksData.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4bb472ac1a8c94c3e9b154e6dfe7983e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSharedData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSharedData.bytes new file mode 100644 index 000000000..704302dba --- /dev/null +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSharedData.bytes @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fad5915e7492e249bc036af7c3911a7ea29acf093a4c53310336cecf2daa7fd +size 147456 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSharedData.bytes.meta b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSharedData.bytes.meta new file mode 100644 index 000000000..954a072d9 --- /dev/null +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSharedData.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 77f0c6e4752ec4c97944e821092ad895 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSupportData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSupportData.bytes new file mode 100644 index 000000000..5e9af9a7a --- /dev/null +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSupportData.bytes @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:331b06b5c63e15d2a6b38fc8dca892bf5b1904e39b369ed69835d9e43faff262 +size 524288 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSupportData.bytes.meta b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSupportData.bytes.meta new file mode 100644 index 000000000..3d27fca13 --- /dev/null +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSupportData.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a489f80b4229c4ad1a66535238bf077b +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.asset b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.asset new file mode 100644 index 000000000..0e9df0cb7 --- /dev/null +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9f59bf317639095fc1758c8e4ef76796847e298e944f7dcbcfc8b381e0b6560 +size 331733 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.asset.meta b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.asset.meta new file mode 100644 index 000000000..2d85b5743 --- /dev/null +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96e9384b8a77642bdad451a41500e01e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab b/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab index c428474ff..9b5bca0d0 100644 --- a/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab +++ b/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 698460856121427746, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_StaticShadowCaster + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1063320636771556828, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_Layer value: 8 diff --git a/Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab b/Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab index 83a877894..984542d34 100644 --- a/Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab +++ b/Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab @@ -14,7 +14,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1063320636771556828, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1241020487330251412, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_Layer @@ -22,7 +22,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1241020487330251412, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4732070946668798894, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_Name @@ -34,7 +34,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4732070946668798894, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_LocalPosition.x