From d7d5bd94964063925359237efbd622dae5c21f28 Mon Sep 17 00:00:00 2001 From: Daniil Basmanov Date: Sat, 10 Sep 2022 16:36:30 +0300 Subject: [PATCH] Upgraded to 2022.1.0f1 --- Samples/Breakout/Breakout.unity | 32 +- Samples/Breakout/BreakoutSettings.lighting | 65 +++ .../Breakout/BreakoutSettings.lighting.meta | 8 + .../BuildingGeneratorComponent.unity | 29 +- ...uildingGeneratorComponentSettings.lighting | 65 +++ ...ngGeneratorComponentSettings.lighting.meta | 8 + .../Buildings/BuildingGeneratorReuse.unity | 29 +- .../BuildingGeneratorReuseSettings.lighting | 65 +++ ...ildingGeneratorReuseSettings.lighting.meta | 8 + Samples/Buildings/Buildings.unity | 110 ++-- Samples/Buildings/BuildingsSettings.lighting | 65 +++ .../Buildings/BuildingsSettings.lighting.meta | 8 + Samples/Buildings/Materials/Glass.mat | 10 +- Samples/Buildings/Materials/Roof.mat | 10 +- Samples/Buildings/Materials/Wall.mat | 10 +- .../CellularAutomata/CellularAutomata.unity | 55 +- .../CellularAutomataSettings.lighting | 65 +++ .../CellularAutomataSettings.lighting.meta | 8 + Samples/Chairs/Chair.mat | 10 +- Samples/Chairs/Chairs.unity | 82 +-- Samples/Chairs/ChairsSettings.lighting | 65 +++ Samples/Chairs/ChairsSettings.lighting.meta | 8 + Samples/Characters/Characters.unity | 40 +- .../Characters/CharactersSettings.lighting | 65 +++ .../CharactersSettings.lighting.meta | 8 + .../roguelikeChar_transparent.png.meta | 470 +++++++++++++++++- Samples/Clipper/PathClipperExample.unity | 30 +- .../PathClipperExampleSettings.lighting | 65 +++ .../PathClipperExampleSettings.lighting.meta | 8 + Samples/Clipper/PathOffsetterExample.unity | 30 +- .../PathOffsetterExampleSettings.lighting | 65 +++ ...PathOffsetterExampleSettings.lighting.meta | 8 + Samples/Common/Resources/ButtonControl.prefab | 7 + Samples/Common/Resources/Skybox.mat | 11 +- Samples/Common/Resources/SliderControl.prefab | 20 + Samples/Common/Resources/TextControl.prefab | 3 + Samples/Common/Resources/ToggleControl.prefab | 11 + Samples/Drawing/Drawing.unity | 20 +- Samples/Drawing/DrawingSettings.lighting | 65 +++ Samples/Drawing/DrawingSettings.lighting.meta | 8 + Samples/LowPolyTerrain/LowPolyTerrain.unity | 78 +-- .../LowPolyTerrainSettings.lighting | 65 +++ .../LowPolyTerrainSettings.lighting.meta | 8 + Samples/LowPolyTerrain/Terrain.mat | 10 +- Samples/MarchingSquares/MarchingSquares.unity | 27 +- .../MarchingSquaresSettings.lighting | 65 +++ .../MarchingSquaresSettings.lighting.meta | 8 + Samples/Mazes/Mazes.unity | 25 +- Samples/Mazes/MazesSettings.lighting | 65 +++ Samples/Mazes/MazesSettings.lighting.meta | 8 + Samples/Noise/Noise.unity | 55 +- Samples/Noise/NoiseSettings.lighting | 65 +++ Samples/Noise/NoiseSettings.lighting.meta | 8 + Samples/Primitives/Primitives.mat | 10 +- Samples/Primitives/Primitives.unity | 86 +++- .../Primitives/PrimitivesSettings.lighting | 65 +++ .../PrimitivesSettings.lighting.meta | 8 + Samples/SDF/Animation.mat | 13 +- Samples/SDF/DistanceOperations.mat | 11 +- Samples/SDF/Easing.mat | 12 +- Samples/SDF/SDF.unity | 189 ++++--- Samples/SDF/SDFSettings.lighting | 65 +++ Samples/SDF/SDFSettings.lighting.meta | 8 + Samples/SDF/Shapes.mat | 11 +- Samples/SDF/StarPolygon.mat | 13 +- Samples/SDF/Transitions.mat | 12 +- .../StraightSkeletonExample.unity | 9 +- .../StraightSkeletonExampleSettings.lighting | 65 +++ ...aightSkeletonExampleSettings.lighting.meta | 8 + Samples/Tessellator/TessellatorExample.unity | 20 +- .../TessellatorExampleSettings.lighting | 65 +++ .../TessellatorExampleSettings.lighting.meta | 8 + Samples/Tessellator/Unlit.mat | 10 +- Shaders/Common.cginc.meta | 4 +- Shaders/Easing.cginc.meta | 4 +- Shaders/SDF.cginc.meta | 4 +- Shaders/Transitions.cginc.meta | 4 +- 77 files changed, 2573 insertions(+), 367 deletions(-) create mode 100644 Samples/Breakout/BreakoutSettings.lighting create mode 100644 Samples/Breakout/BreakoutSettings.lighting.meta create mode 100644 Samples/Buildings/BuildingGeneratorComponentSettings.lighting create mode 100644 Samples/Buildings/BuildingGeneratorComponentSettings.lighting.meta create mode 100644 Samples/Buildings/BuildingGeneratorReuseSettings.lighting create mode 100644 Samples/Buildings/BuildingGeneratorReuseSettings.lighting.meta create mode 100644 Samples/Buildings/BuildingsSettings.lighting create mode 100644 Samples/Buildings/BuildingsSettings.lighting.meta create mode 100644 Samples/CellularAutomata/CellularAutomataSettings.lighting create mode 100644 Samples/CellularAutomata/CellularAutomataSettings.lighting.meta create mode 100644 Samples/Chairs/ChairsSettings.lighting create mode 100644 Samples/Chairs/ChairsSettings.lighting.meta create mode 100644 Samples/Characters/CharactersSettings.lighting create mode 100644 Samples/Characters/CharactersSettings.lighting.meta create mode 100644 Samples/Clipper/PathClipperExampleSettings.lighting create mode 100644 Samples/Clipper/PathClipperExampleSettings.lighting.meta create mode 100644 Samples/Clipper/PathOffsetterExampleSettings.lighting create mode 100644 Samples/Clipper/PathOffsetterExampleSettings.lighting.meta create mode 100644 Samples/Drawing/DrawingSettings.lighting create mode 100644 Samples/Drawing/DrawingSettings.lighting.meta create mode 100644 Samples/LowPolyTerrain/LowPolyTerrainSettings.lighting create mode 100644 Samples/LowPolyTerrain/LowPolyTerrainSettings.lighting.meta create mode 100644 Samples/MarchingSquares/MarchingSquaresSettings.lighting create mode 100644 Samples/MarchingSquares/MarchingSquaresSettings.lighting.meta create mode 100644 Samples/Mazes/MazesSettings.lighting create mode 100644 Samples/Mazes/MazesSettings.lighting.meta create mode 100644 Samples/Noise/NoiseSettings.lighting create mode 100644 Samples/Noise/NoiseSettings.lighting.meta create mode 100644 Samples/Primitives/PrimitivesSettings.lighting create mode 100644 Samples/Primitives/PrimitivesSettings.lighting.meta create mode 100644 Samples/SDF/SDFSettings.lighting create mode 100644 Samples/SDF/SDFSettings.lighting.meta create mode 100644 Samples/StraightSkeleton/StraightSkeletonExampleSettings.lighting create mode 100644 Samples/StraightSkeleton/StraightSkeletonExampleSettings.lighting.meta create mode 100644 Samples/Tessellator/TessellatorExampleSettings.lighting create mode 100644 Samples/Tessellator/TessellatorExampleSettings.lighting.meta diff --git a/Samples/Breakout/Breakout.unity b/Samples/Breakout/Breakout.unity index 2a5cf493..1478d11e 100644 --- a/Samples/Breakout/Breakout.unity +++ b/Samples/Breakout/Breakout.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 86c5a1020e869d64e9623eea934091b8, + type: 2} --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -179,6 +182,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &44211552 Canvas: m_ObjectHideFlags: 0 @@ -197,6 +201,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -210,6 +215,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 414350885} m_Father: {fileID: 0} @@ -290,6 +296,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 4, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -297,8 +304,7 @@ Transform: --- !u!1 &414350884 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 130050, guid: 7340da4b79219ab47b421f3724b154d4, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -317,14 +323,14 @@ GameObject: --- !u!224 &414350885 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22421758, guid: 7340da4b79219ab47b421f3724b154d4, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 414350884} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 44211553} m_RootOrder: 0 @@ -337,8 +343,7 @@ RectTransform: --- !u!114 &414350886 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11409972, guid: 7340da4b79219ab47b421f3724b154d4, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 414350884} @@ -360,11 +365,11 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &414350887 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11425376, guid: 7340da4b79219ab47b421f3724b154d4, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 414350884} @@ -376,6 +381,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.5} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -392,8 +399,7 @@ MonoBehaviour: --- !u!222 &414350888 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22297742, guid: 7340da4b79219ab47b421f3724b154d4, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 414350884} @@ -460,6 +466,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -540,6 +547,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 diff --git a/Samples/Breakout/BreakoutSettings.lighting b/Samples/Breakout/BreakoutSettings.lighting new file mode 100644 index 00000000..7276510f --- /dev/null +++ b/Samples/Breakout/BreakoutSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BreakoutSettings + serializedVersion: 5 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 50 + m_Padding: 2 + m_LightmapCompression: 0 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 1 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/Breakout/BreakoutSettings.lighting.meta b/Samples/Breakout/BreakoutSettings.lighting.meta new file mode 100644 index 00000000..6e18306a --- /dev/null +++ b/Samples/Breakout/BreakoutSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 86c5a1020e869d64e9623eea934091b8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/Buildings/BuildingGeneratorComponent.unity b/Samples/Buildings/BuildingGeneratorComponent.unity index 0f124f7b..3c17c732 100644 --- a/Samples/Buildings/BuildingGeneratorComponent.unity +++ b/Samples/Buildings/BuildingGeneratorComponent.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 333998a33c85c944badb5f6570b8440d, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,14 +119,15 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &54053956 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 162192, guid: 5a2dcfbc5dccea6439d4a0efb4697d90, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -142,8 +144,7 @@ GameObject: --- !u!108 &54053957 Light: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 10837790, guid: 5a2dcfbc5dccea6439d4a0efb4697d90, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 54053956} @@ -199,19 +200,20 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &54053958 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400208, guid: 5a2dcfbc5dccea6439d4a0efb4697d90, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 54053956} m_LocalRotation: {x: 0.39044833, y: -0.34682897, z: 0.161729, w: 0.8373192} m_LocalPosition: {x: 10, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -219,8 +221,7 @@ Transform: --- !u!1 &576240067 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 187108, guid: 3780a9989f827cf4b8076f8fee0f41c8, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -237,8 +238,7 @@ GameObject: --- !u!20 &576240068 Camera: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2040770, guid: 3780a9989f827cf4b8076f8fee0f41c8, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 576240067} @@ -281,14 +281,14 @@ Camera: --- !u!4 &576240069 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 413016, guid: 3780a9989f827cf4b8076f8fee0f41c8, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 576240067} m_LocalRotation: {x: 0.25881907, y: 0, z: 0, w: 0.9659259} m_LocalPosition: {x: 0, y: 27.500002, z: -39} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -353,6 +353,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 diff --git a/Samples/Buildings/BuildingGeneratorComponentSettings.lighting b/Samples/Buildings/BuildingGeneratorComponentSettings.lighting new file mode 100644 index 00000000..d793c1e2 --- /dev/null +++ b/Samples/Buildings/BuildingGeneratorComponentSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BuildingGeneratorComponentSettings + serializedVersion: 5 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/Buildings/BuildingGeneratorComponentSettings.lighting.meta b/Samples/Buildings/BuildingGeneratorComponentSettings.lighting.meta new file mode 100644 index 00000000..8d6efb3f --- /dev/null +++ b/Samples/Buildings/BuildingGeneratorComponentSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 333998a33c85c944badb5f6570b8440d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/Buildings/BuildingGeneratorReuse.unity b/Samples/Buildings/BuildingGeneratorReuse.unity index 1b4ccf80..9ad945c7 100644 --- a/Samples/Buildings/BuildingGeneratorReuse.unity +++ b/Samples/Buildings/BuildingGeneratorReuse.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: ad5a3962aa435c84c9685a1cd7408e94, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,14 +119,15 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &54053956 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 162192, guid: 5a2dcfbc5dccea6439d4a0efb4697d90, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -142,8 +144,7 @@ GameObject: --- !u!108 &54053957 Light: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 10837790, guid: 5a2dcfbc5dccea6439d4a0efb4697d90, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 54053956} @@ -199,19 +200,20 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &54053958 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400208, guid: 5a2dcfbc5dccea6439d4a0efb4697d90, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 54053956} m_LocalRotation: {x: 0.39044833, y: -0.34682897, z: 0.161729, w: 0.8373192} m_LocalPosition: {x: 10, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -219,8 +221,7 @@ Transform: --- !u!1 &576240067 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 187108, guid: 3780a9989f827cf4b8076f8fee0f41c8, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -237,8 +238,7 @@ GameObject: --- !u!20 &576240068 Camera: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2040770, guid: 3780a9989f827cf4b8076f8fee0f41c8, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 576240067} @@ -281,14 +281,14 @@ Camera: --- !u!4 &576240069 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 413016, guid: 3780a9989f827cf4b8076f8fee0f41c8, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 576240067} m_LocalRotation: {x: 0.25881907, y: 0, z: 0, w: 0.9659259} m_LocalPosition: {x: 0, y: 27.500002, z: -39} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -356,6 +356,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 diff --git a/Samples/Buildings/BuildingGeneratorReuseSettings.lighting b/Samples/Buildings/BuildingGeneratorReuseSettings.lighting new file mode 100644 index 00000000..ac055346 --- /dev/null +++ b/Samples/Buildings/BuildingGeneratorReuseSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BuildingGeneratorReuseSettings + serializedVersion: 5 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/Buildings/BuildingGeneratorReuseSettings.lighting.meta b/Samples/Buildings/BuildingGeneratorReuseSettings.lighting.meta new file mode 100644 index 00000000..51ee9905 --- /dev/null +++ b/Samples/Buildings/BuildingGeneratorReuseSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad5a3962aa435c84c9685a1cd7408e94 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/Buildings/Buildings.unity b/Samples/Buildings/Buildings.unity index 825aa2c0..ece2aae2 100644 --- a/Samples/Buildings/Buildings.unity +++ b/Samples/Buildings/Buildings.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 7d3847e6d96ea114bb73b01c9a41922e, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,14 +119,15 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &54053956 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 162192, guid: 5a2dcfbc5dccea6439d4a0efb4697d90, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -142,8 +144,7 @@ GameObject: --- !u!108 &54053957 Light: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 10837790, guid: 5a2dcfbc5dccea6439d4a0efb4697d90, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 54053956} @@ -199,19 +200,20 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &54053958 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400208, guid: 5a2dcfbc5dccea6439d4a0efb4697d90, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 54053956} m_LocalRotation: {x: 0.39044833, y: -0.34682897, z: 0.161729, w: 0.8373192} m_LocalPosition: {x: 10, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -219,8 +221,7 @@ Transform: --- !u!1 &112967773 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 157988, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -239,14 +240,14 @@ GameObject: --- !u!224 &112967774 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22499326, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 112967773} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 567815017} m_RootOrder: 0 @@ -259,8 +260,7 @@ RectTransform: --- !u!114 &112967775 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11498906, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 112967773} @@ -282,11 +282,11 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &112967776 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11472664, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 112967773} @@ -298,6 +298,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.5} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -314,8 +316,7 @@ MonoBehaviour: --- !u!222 &112967777 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22235504, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 112967773} @@ -382,6 +383,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -423,10 +425,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -451,6 +455,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &470626333 Transform: m_ObjectHideFlags: 0 @@ -461,6 +466,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1452797201} m_RootOrder: 0 @@ -468,8 +474,7 @@ Transform: --- !u!1 &567815013 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 173420, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -488,8 +493,7 @@ GameObject: --- !u!114 &567815014 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11440286, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567815013} @@ -506,8 +510,7 @@ MonoBehaviour: --- !u!114 &567815015 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11432824, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567815013} @@ -526,11 +529,11 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &567815016 Canvas: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22368496, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567815013} @@ -545,20 +548,21 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 --- !u!224 &567815017 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22460508, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567815013} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 112967774} - {fileID: 1185486909} @@ -573,8 +577,7 @@ RectTransform: --- !u!1 &576240067 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 187108, guid: 3780a9989f827cf4b8076f8fee0f41c8, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -591,8 +594,7 @@ GameObject: --- !u!20 &576240068 Camera: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2040770, guid: 3780a9989f827cf4b8076f8fee0f41c8, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 576240067} @@ -635,14 +637,14 @@ Camera: --- !u!4 &576240069 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 413016, guid: 3780a9989f827cf4b8076f8fee0f41c8, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 576240067} m_LocalRotation: {x: 0.25881907, y: 0, z: 0, w: 0.9659259} m_LocalPosition: {x: 0, y: 27.500002, z: -39} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -654,7 +656,7 @@ Mesh: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Platform - serializedVersion: 10 + serializedVersion: 11 m_SubMeshes: - serializedVersion: 2 firstByte: 0 @@ -801,12 +803,14 @@ Mesh: m_Center: {x: 0, y: -0.25, z: 0} m_Extent: {x: 21.473665, y: 0.25, z: 21.473665} m_MeshUsageFlags: 0 + m_CookingOptions: 30 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshMetrics[0]: 1 m_MeshMetrics[1]: 1 m_MeshOptimizationFlags: -1 m_StreamData: + serializedVersion: 2 offset: 0 size: 0 path: @@ -817,7 +821,7 @@ Mesh: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - serializedVersion: 10 + serializedVersion: 11 m_SubMeshes: - serializedVersion: 2 firstByte: 0 @@ -964,20 +968,21 @@ Mesh: m_Center: {x: 0, y: 1.5455539, z: 0} m_Extent: {x: 18.2, y: 1.5455539, z: 6.2} m_MeshUsageFlags: 0 + m_CookingOptions: 30 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshMetrics[0]: 1 m_MeshMetrics[1]: 1 m_MeshOptimizationFlags: -1 m_StreamData: + serializedVersion: 2 offset: 0 size: 0 path: --- !u!1 &1185486908 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 112566, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -996,14 +1001,14 @@ GameObject: --- !u!224 &1185486909 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22492038, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1185486908} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 567815017} m_RootOrder: 1 @@ -1016,8 +1021,7 @@ RectTransform: --- !u!114 &1185486910 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11449584, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1185486908} @@ -1029,6 +1033,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1045,8 +1051,7 @@ MonoBehaviour: --- !u!114 &1185486911 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11469028, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1185486908} @@ -1069,8 +1074,7 @@ MonoBehaviour: --- !u!222 &1185486912 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22241514, guid: ec3986a569054e841bfaff935a66c965, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1185486908} @@ -1101,6 +1105,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1897383464} - {fileID: 1346700171} @@ -1135,6 +1140,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 14.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1302152436} m_RootOrder: 1 @@ -1150,10 +1156,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1178,6 +1186,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1346700173 MeshFilter: m_ObjectHideFlags: 0 @@ -1193,7 +1202,7 @@ Mesh: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - serializedVersion: 10 + serializedVersion: 11 m_SubMeshes: - serializedVersion: 2 firstByte: 0 @@ -1350,12 +1359,14 @@ Mesh: m_Center: {x: -0.0000009536743, y: 7.25, z: 0.375} m_Extent: {x: 18.8, y: 7.25, z: 6.425} m_MeshUsageFlags: 0 + m_CookingOptions: 30 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshMetrics[0]: 1 m_MeshMetrics[1]: 1 m_MeshOptimizationFlags: -1 m_StreamData: + serializedVersion: 2 offset: 0 size: 0 path: @@ -1432,6 +1443,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 470626333} m_Father: {fileID: 0} @@ -1465,6 +1477,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1302152436} m_RootOrder: 0 @@ -1480,10 +1493,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1509,6 +1524,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1897383466 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Samples/Buildings/BuildingsSettings.lighting b/Samples/Buildings/BuildingsSettings.lighting new file mode 100644 index 00000000..1c2306cc --- /dev/null +++ b/Samples/Buildings/BuildingsSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BuildingsSettings + serializedVersion: 5 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/Buildings/BuildingsSettings.lighting.meta b/Samples/Buildings/BuildingsSettings.lighting.meta new file mode 100644 index 00000000..8cacc15b --- /dev/null +++ b/Samples/Buildings/BuildingsSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7d3847e6d96ea114bb73b01c9a41922e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/Buildings/Materials/Glass.mat b/Samples/Buildings/Materials/Glass.mat index 7aab8be3..7bfbcadf 100644 --- a/Samples/Buildings/Materials/Glass.mat +++ b/Samples/Buildings/Materials/Glass.mat @@ -2,24 +2,30 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Glass m_Shader: {fileID: 4800000, guid: 40dd86119e3f8e74d8f7d84425c926aa, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: [] + m_Ints: [] m_Floats: - _Metallic: 0.3 - _Smoothness: 1 m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Samples/Buildings/Materials/Roof.mat b/Samples/Buildings/Materials/Roof.mat index 8e481fd0..6da36db9 100644 --- a/Samples/Buildings/Materials/Roof.mat +++ b/Samples/Buildings/Materials/Roof.mat @@ -2,24 +2,30 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Roof m_Shader: {fileID: 4800000, guid: 40dd86119e3f8e74d8f7d84425c926aa, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: [] + m_Ints: [] m_Floats: - _Metallic: 0.5 - _Smoothness: 0.4 m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Samples/Buildings/Materials/Wall.mat b/Samples/Buildings/Materials/Wall.mat index 1f3dc331..3adc1db5 100644 --- a/Samples/Buildings/Materials/Wall.mat +++ b/Samples/Buildings/Materials/Wall.mat @@ -2,24 +2,30 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Wall m_Shader: {fileID: 4800000, guid: 40dd86119e3f8e74d8f7d84425c926aa, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: [] + m_Ints: [] m_Floats: - _Metallic: 0 - _Smoothness: 0 m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Samples/CellularAutomata/CellularAutomata.unity b/Samples/CellularAutomata/CellularAutomata.unity index 1228836d..34f4b767 100644 --- a/Samples/CellularAutomata/CellularAutomata.unity +++ b/Samples/CellularAutomata/CellularAutomata.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: afaeeb30dd934ba4da8368906ba1e8b7, + type: 2} --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -183,6 +186,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -236,6 +240,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -310,6 +315,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -317,8 +323,7 @@ Transform: --- !u!1 &1079176261 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 120114, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -336,14 +341,14 @@ GameObject: --- !u!224 &1079176262 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22456224, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1079176261} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1885498104} m_RootOrder: 0 @@ -356,8 +361,7 @@ RectTransform: --- !u!114 &1079176263 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11433880, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1079176261} @@ -370,8 +374,7 @@ MonoBehaviour: --- !u!114 &1079176264 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11486456, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1079176261} @@ -393,6 +396,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1094236748 GameObject: m_ObjectHideFlags: 0 @@ -427,6 +431,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -447,6 +453,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1283967130} m_RootOrder: 0 @@ -504,6 +511,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1094236750} m_Father: {fileID: 1849558962} @@ -517,8 +525,7 @@ RectTransform: --- !u!1 &1785664459 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 188688, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -537,14 +544,14 @@ GameObject: --- !u!224 &1785664460 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22491358, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1785664459} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1885498104} m_Father: {fileID: 1849558962} @@ -558,8 +565,7 @@ RectTransform: --- !u!114 &1785664461 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11485248, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1785664459} @@ -581,6 +587,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &1785664462 MonoBehaviour: m_ObjectHideFlags: 0 @@ -596,6 +603,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.5} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -646,6 +655,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1785664460} - {fileID: 1283967130} @@ -696,6 +706,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1849558965 Canvas: m_ObjectHideFlags: 0 @@ -714,14 +725,14 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 --- !u!1 &1885498102 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 187044, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -738,8 +749,7 @@ GameObject: --- !u!114 &1885498103 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11411276, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1885498102} @@ -761,17 +771,18 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!224 &1885498104 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22493640, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1885498102} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1079176262} m_Father: {fileID: 1785664460} diff --git a/Samples/CellularAutomata/CellularAutomataSettings.lighting b/Samples/CellularAutomata/CellularAutomataSettings.lighting new file mode 100644 index 00000000..a4aaca79 --- /dev/null +++ b/Samples/CellularAutomata/CellularAutomataSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CellularAutomataSettings + serializedVersion: 5 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 50 + m_Padding: 2 + m_LightmapCompression: 0 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 1 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/CellularAutomata/CellularAutomataSettings.lighting.meta b/Samples/CellularAutomata/CellularAutomataSettings.lighting.meta new file mode 100644 index 00000000..174ad503 --- /dev/null +++ b/Samples/CellularAutomata/CellularAutomataSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: afaeeb30dd934ba4da8368906ba1e8b7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/Chairs/Chair.mat b/Samples/Chairs/Chair.mat index 922e6fe0..76d2341a 100644 --- a/Samples/Chairs/Chair.mat +++ b/Samples/Chairs/Chair.mat @@ -2,20 +2,24 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Chair m_Shader: {fileID: 4800000, guid: 40dd86119e3f8e74d8f7d84425c926aa, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -23,8 +27,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Metallic: 0 - _Smoothness: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Samples/Chairs/Chairs.unity b/Samples/Chairs/Chairs.unity index af561380..afefd51f 100644 --- a/Samples/Chairs/Chairs.unity +++ b/Samples/Chairs/Chairs.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.7096061, g: 0.7096061, b: 0.7096061, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: a24232437e93bb4418b25b66214c1b83, + type: 2} --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -118,14 +119,15 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &59905627 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 137856, guid: 2a85ccb36ff88884c9273c4ff790aa9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -144,14 +146,14 @@ GameObject: --- !u!224 &59905628 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22477128, guid: 2a85ccb36ff88884c9273c4ff790aa9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59905627} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1764644562} - {fileID: 1484817441} @@ -166,8 +168,7 @@ RectTransform: --- !u!114 &59905630 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11414402, guid: 2a85ccb36ff88884c9273c4ff790aa9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59905627} @@ -184,8 +185,7 @@ MonoBehaviour: --- !u!114 &59905631 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11452088, guid: 2a85ccb36ff88884c9273c4ff790aa9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59905627} @@ -204,11 +204,11 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &59905632 Canvas: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22354986, guid: 2a85ccb36ff88884c9273c4ff790aa9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59905627} @@ -223,6 +223,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -302,6 +303,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &265645929 @@ -314,6 +316,7 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 10, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -380,6 +383,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -412,6 +416,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1996828783} m_RootOrder: 0 @@ -435,10 +440,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -463,11 +470,11 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1484817437 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 177016, guid: 2a85ccb36ff88884c9273c4ff790aa9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -486,8 +493,7 @@ GameObject: --- !u!114 &1484817438 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11425796, guid: 2a85ccb36ff88884c9273c4ff790aa9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484817437} @@ -499,6 +505,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -538,8 +546,7 @@ MonoBehaviour: --- !u!222 &1484817440 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22230998, guid: 2a85ccb36ff88884c9273c4ff790aa9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484817437} @@ -547,14 +554,14 @@ CanvasRenderer: --- !u!224 &1484817441 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22414106, guid: 2a85ccb36ff88884c9273c4ff790aa9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484817437} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 59905628} m_RootOrder: 1 @@ -634,6 +641,7 @@ Transform: m_LocalRotation: {x: 0.06975647, y: 0, z: 0, w: 0.9975641} m_LocalPosition: {x: 0, y: 1, z: -3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -645,7 +653,7 @@ Mesh: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Platform - serializedVersion: 10 + serializedVersion: 11 m_SubMeshes: - serializedVersion: 2 firstByte: 0 @@ -792,12 +800,14 @@ Mesh: m_Center: {x: 0, y: -0.025, z: 0} m_Extent: {x: 1.0449747, y: 0.025, z: 1.0449747} m_MeshUsageFlags: 0 + m_CookingOptions: 30 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshMetrics[0]: 1 m_MeshMetrics[1]: 1 m_MeshOptimizationFlags: -1 m_StreamData: + serializedVersion: 2 offset: 0 size: 0 path: @@ -808,7 +818,7 @@ Mesh: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Chair - serializedVersion: 10 + serializedVersion: 11 m_SubMeshes: - serializedVersion: 2 firstByte: 0 @@ -955,20 +965,21 @@ Mesh: m_Center: {x: 0, y: 0.775, z: 0} m_Extent: {x: 0.35, y: 0.775, z: 0.35} m_MeshUsageFlags: 0 + m_CookingOptions: 30 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshMetrics[0]: 1 m_MeshMetrics[1]: 1 m_MeshOptimizationFlags: -1 m_StreamData: + serializedVersion: 2 offset: 0 size: 0 path: --- !u!1 &1764644561 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 177016, guid: 2a85ccb36ff88884c9273c4ff790aa9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -987,14 +998,14 @@ GameObject: --- !u!224 &1764644562 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22414106, guid: 2a85ccb36ff88884c9273c4ff790aa9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1764644561} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 59905628} m_RootOrder: 0 @@ -1007,8 +1018,7 @@ RectTransform: --- !u!114 &1764644563 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11451960, guid: 2a85ccb36ff88884c9273c4ff790aa9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1764644561} @@ -1030,11 +1040,11 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &1764644564 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11425796, guid: 2a85ccb36ff88884c9273c4ff790aa9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1764644561} @@ -1046,6 +1056,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.5} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1062,8 +1074,7 @@ MonoBehaviour: --- !u!222 &1764644565 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22230998, guid: 2a85ccb36ff88884c9273c4ff790aa9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1764644561} @@ -1105,10 +1116,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1133,6 +1146,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &1870496927 Transform: m_ObjectHideFlags: 0 @@ -1143,6 +1157,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1996828783} m_RootOrder: 1 @@ -1200,6 +1215,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 462778070} - {fileID: 1870496927} diff --git a/Samples/Chairs/ChairsSettings.lighting b/Samples/Chairs/ChairsSettings.lighting new file mode 100644 index 00000000..c36e14f7 --- /dev/null +++ b/Samples/Chairs/ChairsSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ChairsSettings + serializedVersion: 5 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 50 + m_Padding: 2 + m_LightmapCompression: 0 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 1 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/Chairs/ChairsSettings.lighting.meta b/Samples/Chairs/ChairsSettings.lighting.meta new file mode 100644 index 00000000..9e1ec501 --- /dev/null +++ b/Samples/Chairs/ChairsSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a24232437e93bb4418b25b66214c1b83 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/Characters/Characters.unity b/Samples/Characters/Characters.unity index a1583193..0bc200a3 100644 --- a/Samples/Characters/Characters.unity +++ b/Samples/Characters/Characters.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 4c4bf45619d0f374d9f15aa63afe3796, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -619,6 +622,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -651,10 +655,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -700,6 +706,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1795698937} m_RootOrder: 3 @@ -732,10 +739,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -781,6 +790,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1795698937} m_RootOrder: 1 @@ -813,10 +823,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -862,6 +874,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1795698937} m_RootOrder: 4 @@ -894,10 +907,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -943,6 +958,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1795698937} m_RootOrder: 5 @@ -975,10 +991,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1024,6 +1042,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1795698937} m_RootOrder: 2 @@ -1056,10 +1075,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1105,6 +1126,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1795698937} m_RootOrder: 7 @@ -1137,6 +1159,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1485295980} m_RootOrder: 0 @@ -1161,6 +1184,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1256,6 +1281,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1318,6 +1344,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1485295979 Canvas: m_ObjectHideFlags: 0 @@ -1336,6 +1363,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 32767 m_TargetDisplay: 0 @@ -1349,6 +1377,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1401247600} m_Father: {fileID: 0} @@ -1387,10 +1416,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1436,6 +1467,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1795698937} m_RootOrder: 0 @@ -1488,6 +1520,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.1, z: 0} m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1736633086} - {fileID: 483052651} @@ -1528,10 +1561,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1577,6 +1612,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1795698937} m_RootOrder: 6 diff --git a/Samples/Characters/CharactersSettings.lighting b/Samples/Characters/CharactersSettings.lighting new file mode 100644 index 00000000..2530838b --- /dev/null +++ b/Samples/Characters/CharactersSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CharactersSettings + serializedVersion: 5 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/Characters/CharactersSettings.lighting.meta b/Samples/Characters/CharactersSettings.lighting.meta new file mode 100644 index 00000000..85060816 --- /dev/null +++ b/Samples/Characters/CharactersSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c4bf45619d0f374d9f15aa63afe3796 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/Characters/roguelikeChar_transparent.png.meta b/Samples/Characters/roguelikeChar_transparent.png.meta index 7c7defd1..a191ea21 100644 --- a/Samples/Characters/roguelikeChar_transparent.png.meta +++ b/Samples/Characters/roguelikeChar_transparent.png.meta @@ -1557,7 +1557,7 @@ TextureImporter: 213: 21301034 second: weapon_61 externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -1574,9 +1574,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -1586,11 +1589,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -1608,9 +1611,14 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -11093,9 +11101,457 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + feet_12: 21300566 + chest_73: 21300568 + weapon_2: 21300074 + chest_89: 21300668 + character_10: 21301028 + hair_33: 21300408 + weapon_59: 21300468 + shield_58: 21300790 + weapon_13: 21300170 + hair_72: 21300850 + weapon_87: 21300736 + hair_69: 21300844 + hair_62: 21300694 + shield_18: 21300252 + hair_52: 21300598 + shield_51: 21300712 + chest_117: 21300836 + hair_51: 21300596 + hair_20: 21300232 + shield_30: 21300434 + weapon_102: 21300854 + hair_64: 21300698 + hair_66: 21300774 + chest_80: 21300582 + shield_9: 21300154 + weapon_57: 21300464 + shield_7: 21300068 + weapon_1: 21300072 + chest_102: 21300758 + feet_1: 21300992 + chest_39: 21300294 + weapon_42: 21300364 + head_32: 21300706 + hair_11: 21300134 + chest_70: 21300500 + chest_13: 21300106 + head_9: 21300242 + weapon_110: 21300870 + chest_100: 21300754 + chest_72: 21300504 + chest_92: 21300674 + weapon_97: 21300808 + shield_8: 21300070 + chest_96: 21300682 + chest_105: 21300764 + chest_113: 21300828 + hair_76: 21300882 + weapon_109: 21300868 + hair_77: 21300888 + head_4: 21300054 + chest_29: 21300210 + legs_3: 21301000 + chest_55: 21300396 + shield_54: 21300718 + chest_2: 21300906 + shield_41: 21300616 + hair_63: 21300696 + chest_64: 21300488 + head_20: 21300430 + hair_75: 21300880 + head_29: 21300700 + weapon_94: 21300802 + weapon_7: 21300084 + weapon_40: 21300360 + shield_4: 21300062 + body_4: 21300944 + chest_60: 21300406 + weapon_71: 21300632 + character_3: 21301016 + hair_70: 21300846 + chest_116: 21300834 + weapon_8: 21300086 + legs_1: 21300990 + weapon_107: 21300864 + hair_49: 21300592 + head_24: 21300528 + chest_56: 21300398 + chest_79: 21300580 + chest_98: 21300750 + weapon_25: 21300258 + weapon_83: 21300728 + shield_38: 21300532 + head_5: 21300146 + shield_27: 21300350 + weapon_68: 21300552 + weapon_45: 21300370 + chest_68: 21300496 + chest_49: 21300384 + character_14: 21300886 + hair_18: 21300228 + shield_1: 21300056 + weapon_9: 21300088 + chest_112: 21300826 + chest_36: 21300224 + shield_20: 21300256 + shield_46: 21300626 + chest_86: 21300662 + chest_43: 21300302 + shield_52: 21300714 + chest_76: 21300574 + chest_40: 21300296 + hair_29: 21300322 + head_17: 21300424 + head_28: 21300614 + chest_10: 21300026 + shield_25: 21300346 + hair_58: 21300686 + legs_5: 21301008 + chest_87: 21300664 + chest_62: 21300484 + shield_29: 21300432 + weapon_104: 21300858 + legs_8: 21300656 + chest_59: 21300404 + feet_4: 21300288 + hair_35: 21300412 + chest_19: 21300118 + head_7: 21300150 + shield_42: 21300618 + chest_90: 21300670 + chest_20: 21300120 + chest_31: 21300214 + feet_8: 21300658 + hair_40: 21300422 + hair_43: 21300510 + shield_23: 21300342 + chest_54: 21300394 + shield_11: 21300158 + head_12: 21300248 + chest_1: 21300904 + character_8: 21300746 + hair_5: 21300934 + weapon_5: 21300080 + chest_65: 21300490 + hair_48: 21300520 + weapon_85: 21300732 + hair_24: 21300240 + chest_4: 21300910 + feet_5: 21300380 + hair_32: 21300328 + head_34: 21300782 + chest_77: 21300576 + chest_83: 21300588 + weapon_81: 21300724 + weapon_66: 21300548 + chest_22: 21300124 + weapon_105: 21300860 + shield_60: 21300794 + chest_103: 21300760 + shield_21: 21300338 + hair_36: 21300414 + weapon_55: 21300460 + chest_46: 21300308 + chest_47: 21300310 + shield_39: 21300534 + shield_47: 21300628 + weapon_51: 21300452 + hair_68: 21300778 + head_2: 21300050 + head_6: 21300148 + weapon_74: 21300638 + weapon_92: 21300798 + weapon_99: 21300812 + weapon_43: 21300366 + chest_17: 21300114 + weapon_77: 21300644 + shield_50: 21300710 + weapon_48: 21301006 + shield_35: 21300444 + hair_44: 21300512 + weapon_84: 21300730 + shield_36: 21300446 + weapon_37: 21300354 + head_26: 21300610 + head_18: 21300426 + hair_67: 21300776 + hair_1: 21300926 + head_13: 21300330 + weapon_35: 21300278 + head_14: 21300332 + hair_60: 21300690 + shield_31: 21300436 + chest_48: 21300312 + weapon_88: 21300738 + hair_71: 21300848 + shield_6: 21300066 + weapon_64: 21300544 + chest_111: 21300824 + chest_115: 21300832 + hair_16: 21300144 + chest_53: 21300392 + hair_59: 21300688 + shield_22: 21300340 + chest_28: 21300208 + weapon_41: 21300362 + weapon_100: 21300814 + chest_69: 21300498 + hair_39: 21300420 + weapon_86: 21300734 + legs_2: 21300994 + hair_45: 21300514 + weapon_20: 21300184 + shield_59: 21300792 + weapon_76: 21300642 + weapon_95: 21300804 + chest_118: 21300838 + weapon_39: 21300358 + weapon_101: 21300852 + weapon_17: 21300178 + head_35: 21300784 + hair_37: 21300416 + hair_56: 21300606 + chest_61: 21300482 + chest_81: 21300584 + shield_24: 21300344 + hair_12: 21300136 + body_6: 21300952 + hair_73: 21300876 + weapon_54: 21300458 + shield_2: 21300058 + hair_22: 21300236 + chest_63: 21300486 + head_21: 21300522 + shield_37: 21300530 + head_23: 21300526 + hair_42: 21300508 + weapon_26: 21300260 + hair_4: 21300932 + head_3: 21300052 + chest_37: 21300290 + weapon_69: 21300554 + shield_53: 21300716 + head_30: 21300702 + shield_56: 21300722 + hair_21: 21300234 + weapon_96: 21300806 + head_15: 21300334 + feet_10: 21300382 + chest_41: 21300298 + hair_38: 21300418 + weapon_89: 21301022 + chest_78: 21300578 + hair_15: 21300142 + chest_23: 21300126 + chest_101: 21300756 + shield_44: 21300622 + weapon_73: 21300636 + weapon_52: 21300454 + chest_14: 21300108 + chest_119: 21300840 + chest_6: 21300914 + weapon_93: 21300800 + weapon_29: 21300266 + chest_12: 21300924 + feet_11: 21300480 + chest_120: 21300842 + body_5: 21300950 + shield_40: 21300536 + chest_71: 21300502 + hair_13: 21300138 + weapon_14: 21300172 + legs_6: 21300476 + head_1: 21300048 + chest_3: 21300908 + chest_107: 21300768 + character_5: 21300652 + shield_43: 21300620 + shield_3: 21300060 + chest_66: 21300492 + hair_74: 21300878 + chest_94: 21300678 + hair_25: 21300314 + chest_74: 21300570 + shield_13: 21300162 + body_7: 21300958 + chest_45: 21300306 + shield_49: 21300708 + weapon_70: 21301014 + shield_28: 21300352 + chest_58: 21300402 + hair_28: 21300320 + chest_52: 21300390 + chest_34: 21300220 + chest_35: 21300222 + hair_8: 21300940 + character_6: 21300654 + shield_26: 21300348 + shield_5: 21300064 + chest_15: 21300110 + weapon_23: 21300190 + weapon_10: 21300090 + weapon_91: 21300796 + head_10: 21300244 + chest_97: 21300748 + weapon_50: 21300450 + weapon_21: 21300186 + weapon_67: 21300550 + head_22: 21300524 + shield_10: 21300156 + head_11: 21300246 + hair_27: 21300318 + weapon_58: 21300466 + chest_18: 21300116 + hair_23: 21300238 + weapon_108: 21300866 + weapon_28: 21300264 + weapon_31: 21300270 + weapon_62: 21300540 + hair_7: 21300938 + chest_16: 21300112 + weapon_32: 21300272 + weapon_98: 21300810 + head_16: 21300336 + weapon_106: 21300862 + hair_53: 21300600 + shield_32: 21300438 + chest_26: 21300204 + chest_93: 21300676 + chest_57: 21300400 + weapon_4: 21300078 + weapon_18: 21300180 + chest_33: 21300218 + head_31: 21300704 + weapon_44: 21300368 + weapon_46: 21300372 + shield_14: 21300164 + hair_47: 21300518 + weapon_82: 21300726 + hair_46: 21300516 + chest_7: 21300916 + character_2: 21301012 + chest_21: 21300122 + shield_17: 21300250 + chest_84: 21300590 + character_12: 21300874 + weapon_11: 21300092 + weapon_22: 21300188 + weapon_63: 21300542 + hair_78: 21300890 + shield_45: 21300624 + weapon_3: 21300076 + weapon_49: 21300448 + hair_6: 21300936 + legs_4: 21301004 + chest_108: 21300770 + character_7: 21300744 + weapon_33: 21300274 + chest_11: 21300922 + head_27: 21300612 + hair_14: 21300140 + hair_30: 21300324 + character_11: 21300872 + hair_17: 21300226 + weapon_60: 21300470 + weapon_90: 21301024 + character_1: 21301010 + head_36: 21300786 + weapon_15: 21300174 + hair_61: 21300692 + chest_25: 21300202 + hair_2: 21300928 + chest_88: 21300666 + chest_8: 21300918 + shield_57: 21300788 + character_9: 21301026 + chest_106: 21300766 + chest_85: 21300660 + chest_82: 21300586 + feet_9: 21300104 + weapon_53: 21300456 + hair_26: 21300316 + feet_6: 21300478 + weapon_65: 21300546 + shield_33: 21300440 + weapon_75: 21300640 + weapon_103: 21300856 + weapon_30: 21300268 + hair_41: 21300506 + chest_27: 21300206 + chest_42: 21300300 + chest_99: 21300752 + chest_30: 21300212 + weapon_80: 21301020 + legs_7: 21300562 + shield_34: 21300442 + head_8: 21300152 + chest_32: 21300216 + chest_51: 21300388 + weapon_27: 21300262 + hair_80: 21300894 + weapon_47: 21300374 + weapon_72: 21300634 + head_19: 21300428 + weapon_16: 21300176 + hair_31: 21300326 + body_1: 21300896 + weapon_56: 21300462 + hair_19: 21300230 + weapon_24: 21301030 + shield_15: 21300166 + head_25: 21300608 + character_13: 21300884 + weapon_12: 21300094 + chest_5: 21300912 + hair_57: 21300684 + feet_2: 21300996 + shield_12: 21300160 + character_4: 21300560 + hair_55: 21300604 + shield_16: 21300168 + hair_54: 21300602 + weapon_36: 21301032 + chest_114: 21300830 + weapon_79: 21301018 + chest_75: 21300572 + body_3: 21300942 + weapon_19: 21300182 + chest_24: 21300128 + body_2: 21300898 + chest_50: 21300386 + chest_44: 21300304 + hair_50: 21300594 + chest_110: 21300822 + shield_55: 21300720 + chest_38: 21300292 + hair_65: 21300772 + head_33: 21300780 + shield_19: 21300254 + hair_34: 21300410 + weapon_61: 21301034 + chest_91: 21300672 + feet_3: 21300200 + chest_95: 21300680 + weapon_78: 21300646 + weapon_38: 21300356 + shield_48: 21300630 + chest_104: 21300762 + feet_7: 21300564 + hair_10: 21300132 + chest_67: 21300494 + weapon_6: 21300082 + hair_3: 21300930 + chest_9: 21300920 + hair_9: 21300130 + body_8: 21300960 + hair_79: 21300892 + chest_109: 21300820 + weapon_34: 21300276 spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Samples/Clipper/PathClipperExample.unity b/Samples/Clipper/PathClipperExample.unity index 157688e2..14e6d4c0 100644 --- a/Samples/Clipper/PathClipperExample.unity +++ b/Samples/Clipper/PathClipperExample.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 4b804d85385e6f546ad3dadd9640b88b, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -140,6 +143,7 @@ GameObject: m_IsActive: 1 --- !u!120 &261166008 LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -149,10 +153,12 @@ LineRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -229,10 +235,13 @@ LineRenderer: numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0 generateLightingData: 0 + m_MaskInteraction: 0 m_UseWorldSpace: 0 m_Loop: 1 + m_ApplyActiveColorSpace: 0 --- !u!4 &261166009 Transform: m_ObjectHideFlags: 0 @@ -243,6 +252,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -266,6 +276,7 @@ GameObject: m_IsActive: 1 --- !u!120 &1030582852 LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -275,10 +286,12 @@ LineRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -355,10 +368,13 @@ LineRenderer: numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0 generateLightingData: 0 + m_MaskInteraction: 0 m_UseWorldSpace: 0 m_Loop: 1 + m_ApplyActiveColorSpace: 0 --- !u!4 &1030582853 Transform: m_ObjectHideFlags: 0 @@ -369,6 +385,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -400,6 +417,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -489,6 +507,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -512,6 +531,7 @@ GameObject: m_IsActive: 1 --- !u!120 &2147331980 LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -521,10 +541,12 @@ LineRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -601,10 +623,13 @@ LineRenderer: numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0 generateLightingData: 0 + m_MaskInteraction: 0 m_UseWorldSpace: 0 m_Loop: 1 + m_ApplyActiveColorSpace: 0 --- !u!4 &2147331981 Transform: m_ObjectHideFlags: 0 @@ -615,6 +640,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 diff --git a/Samples/Clipper/PathClipperExampleSettings.lighting b/Samples/Clipper/PathClipperExampleSettings.lighting new file mode 100644 index 00000000..451dd25e --- /dev/null +++ b/Samples/Clipper/PathClipperExampleSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PathClipperExampleSettings + serializedVersion: 5 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/Clipper/PathClipperExampleSettings.lighting.meta b/Samples/Clipper/PathClipperExampleSettings.lighting.meta new file mode 100644 index 00000000..1a4757a2 --- /dev/null +++ b/Samples/Clipper/PathClipperExampleSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4b804d85385e6f546ad3dadd9640b88b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/Clipper/PathOffsetterExample.unity b/Samples/Clipper/PathOffsetterExample.unity index d71600e8..644d767e 100644 --- a/Samples/Clipper/PathOffsetterExample.unity +++ b/Samples/Clipper/PathOffsetterExample.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 9cd1e5d799a8c46419c2018c52fad894, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -140,6 +143,7 @@ GameObject: m_IsActive: 1 --- !u!120 &1030582852 LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -149,10 +153,12 @@ LineRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -229,10 +235,13 @@ LineRenderer: numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0 generateLightingData: 0 + m_MaskInteraction: 0 m_UseWorldSpace: 0 m_Loop: 1 + m_ApplyActiveColorSpace: 0 --- !u!4 &1030582853 Transform: m_ObjectHideFlags: 0 @@ -243,6 +252,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -266,6 +276,7 @@ GameObject: m_IsActive: 1 --- !u!120 &1261002265 LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -275,10 +286,12 @@ LineRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -355,10 +368,13 @@ LineRenderer: numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0 generateLightingData: 0 + m_MaskInteraction: 0 m_UseWorldSpace: 0 m_Loop: 1 + m_ApplyActiveColorSpace: 0 --- !u!4 &1261002266 Transform: m_ObjectHideFlags: 0 @@ -369,6 +385,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -400,6 +417,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -489,6 +507,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -512,6 +531,7 @@ GameObject: m_IsActive: 1 --- !u!120 &2147331980 LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -521,10 +541,12 @@ LineRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -601,10 +623,13 @@ LineRenderer: numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0 generateLightingData: 0 + m_MaskInteraction: 0 m_UseWorldSpace: 0 m_Loop: 1 + m_ApplyActiveColorSpace: 0 --- !u!4 &2147331981 Transform: m_ObjectHideFlags: 0 @@ -615,6 +640,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 diff --git a/Samples/Clipper/PathOffsetterExampleSettings.lighting b/Samples/Clipper/PathOffsetterExampleSettings.lighting new file mode 100644 index 00000000..a810c660 --- /dev/null +++ b/Samples/Clipper/PathOffsetterExampleSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PathOffsetterExampleSettings + serializedVersion: 5 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/Clipper/PathOffsetterExampleSettings.lighting.meta b/Samples/Clipper/PathOffsetterExampleSettings.lighting.meta new file mode 100644 index 00000000..3f25b0f8 --- /dev/null +++ b/Samples/Clipper/PathOffsetterExampleSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9cd1e5d799a8c46419c2018c52fad894 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/Common/Resources/ButtonControl.prefab b/Samples/Common/Resources/ButtonControl.prefab index 67440a22..632bb5cb 100644 --- a/Samples/Common/Resources/ButtonControl.prefab +++ b/Samples/Common/Resources/ButtonControl.prefab @@ -28,6 +28,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22414110} m_RootOrder: 0 @@ -60,6 +61,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -108,6 +111,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22456214} m_Father: {fileID: 0} @@ -141,6 +145,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -168,6 +174,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} diff --git a/Samples/Common/Resources/Skybox.mat b/Samples/Common/Resources/Skybox.mat index 2d81eeb7..06d0a106 100644 --- a/Samples/Common/Resources/Skybox.mat +++ b/Samples/Common/Resources/Skybox.mat @@ -2,23 +2,29 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Skybox m_Shader: {fileID: 4800000, guid: 0bfcf4c10b2626940ad26b7f045faf56, type: 3} - m_ShaderKeywords: _SUNDISK_HIGH_QUALITY + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _SUNDISK_HIGH_QUALITY m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: [] + m_Ints: [] m_Floats: - _Exponent1: 3 - _Exponent2: 1 @@ -27,3 +33,4 @@ Material: - _GroundColor: {r: 0.75, g: 0.75, b: 0.75, a: 0} - _HorizonColor: {r: 0.25, g: 0.25, b: 0.25, a: 0} - _SkyColor: {r: 1, g: 1, b: 1, a: 0} + m_BuildTextureStacks: [] diff --git a/Samples/Common/Resources/SliderControl.prefab b/Samples/Common/Resources/SliderControl.prefab index 27ade4dd..3c2dff72 100644 --- a/Samples/Common/Resources/SliderControl.prefab +++ b/Samples/Common/Resources/SliderControl.prefab @@ -26,6 +26,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22404572} m_Father: {fileID: 22414192} @@ -62,6 +63,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22447022} m_Father: {fileID: 22414192} @@ -100,6 +102,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22414192} m_RootOrder: 0 @@ -132,6 +135,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -173,6 +178,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22442374} m_RootOrder: 0 @@ -205,6 +211,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -250,6 +258,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22412656} m_RootOrder: 0 @@ -282,6 +291,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -323,6 +334,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22442374} m_RootOrder: 2 @@ -355,6 +367,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -400,6 +414,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22415836} - {fileID: 22414192} @@ -475,6 +490,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22449288} m_RootOrder: 0 @@ -507,6 +523,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -547,6 +565,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22421638} - {fileID: 22449288} @@ -573,6 +592,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} diff --git a/Samples/Common/Resources/TextControl.prefab b/Samples/Common/Resources/TextControl.prefab index caa4b822..feb9091c 100644 --- a/Samples/Common/Resources/TextControl.prefab +++ b/Samples/Common/Resources/TextControl.prefab @@ -30,6 +30,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -62,6 +63,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] diff --git a/Samples/Common/Resources/ToggleControl.prefab b/Samples/Common/Resources/ToggleControl.prefab index 106e25d1..68d44f50 100644 --- a/Samples/Common/Resources/ToggleControl.prefab +++ b/Samples/Common/Resources/ToggleControl.prefab @@ -28,6 +28,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22461302} m_Father: {fileID: 22449660} @@ -61,6 +62,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -103,6 +106,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22497706} - {fileID: 22495148} @@ -128,6 +132,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -223,6 +228,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22449660} m_RootOrder: 1 @@ -255,6 +261,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -300,6 +308,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22497706} m_RootOrder: 0 @@ -332,6 +341,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] diff --git a/Samples/Drawing/Drawing.unity b/Samples/Drawing/Drawing.unity index a3f3c9f5..483a1c34 100644 --- a/Samples/Drawing/Drawing.unity +++ b/Samples/Drawing/Drawing.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.7096061, g: 0.7096061, b: 0.7096061, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: f78fbed8f4117804c8b9df7f75ccc846, + type: 2} --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -197,6 +200,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &423463294 @@ -209,6 +213,7 @@ Transform: m_LocalRotation: {x: 0.40821794, y: -0.23456973, z: 0.10938166, w: 0.8754261} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -242,6 +247,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1226276357} m_RootOrder: 0 @@ -266,6 +272,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -372,6 +380,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -446,6 +455,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -508,6 +518,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1226276356 Canvas: m_ObjectHideFlags: 0 @@ -526,6 +537,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -539,6 +551,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 512307774} m_Father: {fileID: 0} @@ -576,6 +589,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 diff --git a/Samples/Drawing/DrawingSettings.lighting b/Samples/Drawing/DrawingSettings.lighting new file mode 100644 index 00000000..8985dec4 --- /dev/null +++ b/Samples/Drawing/DrawingSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DrawingSettings + serializedVersion: 5 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 50 + m_Padding: 2 + m_LightmapCompression: 0 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 1 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/Drawing/DrawingSettings.lighting.meta b/Samples/Drawing/DrawingSettings.lighting.meta new file mode 100644 index 00000000..a674c0ae --- /dev/null +++ b/Samples/Drawing/DrawingSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f78fbed8f4117804c8b9df7f75ccc846 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/LowPolyTerrain/LowPolyTerrain.unity b/Samples/LowPolyTerrain/LowPolyTerrain.unity index b9368b3e..2fdbcd53 100644 --- a/Samples/LowPolyTerrain/LowPolyTerrain.unity +++ b/Samples/LowPolyTerrain/LowPolyTerrain.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.7096061, g: 0.7096061, b: 0.7096061, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 7c8c78b0f5c55cc4c9f1769c90fcf41e, + type: 2} --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -183,6 +186,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -190,8 +194,7 @@ Transform: --- !u!1 &466175283 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 126034, guid: 0bc0ac62dcca19446890462247ee487c, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -210,14 +213,14 @@ GameObject: --- !u!224 &466175284 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22405940, guid: 0bc0ac62dcca19446890462247ee487c, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 466175283} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1832017631} - {fileID: 693684436} @@ -232,8 +235,7 @@ RectTransform: --- !u!114 &466175285 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11431070, guid: 0bc0ac62dcca19446890462247ee487c, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 466175283} @@ -250,8 +252,7 @@ MonoBehaviour: --- !u!114 &466175286 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11448610, guid: 0bc0ac62dcca19446890462247ee487c, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 466175283} @@ -270,11 +271,11 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &466175287 Canvas: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22322820, guid: 0bc0ac62dcca19446890462247ee487c, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 466175283} @@ -289,14 +290,14 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 --- !u!1 &693684432 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 168256, guid: 0bc0ac62dcca19446890462247ee487c, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -315,8 +316,7 @@ GameObject: --- !u!114 &693684433 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11453326, guid: 0bc0ac62dcca19446890462247ee487c, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 693684432} @@ -328,6 +328,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -367,8 +369,7 @@ MonoBehaviour: --- !u!222 &693684435 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22257302, guid: 0bc0ac62dcca19446890462247ee487c, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 693684432} @@ -376,14 +377,14 @@ CanvasRenderer: --- !u!224 &693684436 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22401078, guid: 0bc0ac62dcca19446890462247ee487c, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 693684432} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 466175284} m_RootOrder: 1 @@ -400,7 +401,7 @@ Mesh: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Terrain - serializedVersion: 10 + serializedVersion: 11 m_SubMeshes: - serializedVersion: 2 firstByte: 0 @@ -547,12 +548,14 @@ Mesh: m_Center: {x: 0, y: 2.4250236, z: 0} m_Extent: {x: 16, y: 1.5959626, z: 16} m_MeshUsageFlags: 0 + m_CookingOptions: 30 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshMetrics[0]: 1 m_MeshMetrics[1]: 1 m_MeshOptimizationFlags: 1 m_StreamData: + serializedVersion: 2 offset: 0 size: 0 path: @@ -626,6 +629,7 @@ Transform: m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} m_LocalPosition: {x: 0, y: 8, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -706,6 +710,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1327247760 @@ -718,6 +723,7 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -751,9 +757,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 823837519} --- !u!33 &1534059044 MeshFilter: @@ -774,10 +780,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -802,6 +810,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &1534059046 Transform: m_ObjectHideFlags: 0 @@ -812,6 +821,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1778108170} m_RootOrder: 0 @@ -892,6 +902,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1534059046} m_Father: {fileID: 0} @@ -900,8 +911,7 @@ Transform: --- !u!1 &1832017630 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 168256, guid: 0bc0ac62dcca19446890462247ee487c, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -920,14 +930,14 @@ GameObject: --- !u!224 &1832017631 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22401078, guid: 0bc0ac62dcca19446890462247ee487c, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1832017630} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 466175284} m_RootOrder: 0 @@ -940,8 +950,7 @@ RectTransform: --- !u!114 &1832017632 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11455872, guid: 0bc0ac62dcca19446890462247ee487c, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1832017630} @@ -963,11 +972,11 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &1832017633 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11453326, guid: 0bc0ac62dcca19446890462247ee487c, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1832017630} @@ -979,6 +988,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.5} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -995,8 +1006,7 @@ MonoBehaviour: --- !u!222 &1832017634 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22257302, guid: 0bc0ac62dcca19446890462247ee487c, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1832017630} diff --git a/Samples/LowPolyTerrain/LowPolyTerrainSettings.lighting b/Samples/LowPolyTerrain/LowPolyTerrainSettings.lighting new file mode 100644 index 00000000..bc4065ed --- /dev/null +++ b/Samples/LowPolyTerrain/LowPolyTerrainSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LowPolyTerrainSettings + serializedVersion: 5 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 50 + m_Padding: 2 + m_LightmapCompression: 0 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 1 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/LowPolyTerrain/LowPolyTerrainSettings.lighting.meta b/Samples/LowPolyTerrain/LowPolyTerrainSettings.lighting.meta new file mode 100644 index 00000000..ebe573bd --- /dev/null +++ b/Samples/LowPolyTerrain/LowPolyTerrainSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c8c78b0f5c55cc4c9f1769c90fcf41e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/LowPolyTerrain/Terrain.mat b/Samples/LowPolyTerrain/Terrain.mat index 1d380e9f..758461fc 100644 --- a/Samples/LowPolyTerrain/Terrain.mat +++ b/Samples/LowPolyTerrain/Terrain.mat @@ -2,24 +2,30 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Terrain m_Shader: {fileID: 4800000, guid: 40dd86119e3f8e74d8f7d84425c926aa, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: [] + m_Ints: [] m_Floats: - _Metallic: 0 - _Smoothness: 0 m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Samples/MarchingSquares/MarchingSquares.unity b/Samples/MarchingSquares/MarchingSquares.unity index e3a0d094..b493ca9b 100644 --- a/Samples/MarchingSquares/MarchingSquares.unity +++ b/Samples/MarchingSquares/MarchingSquares.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 780e9b5262a56c34b9dca10ca41b89f5, + type: 2} --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -150,10 +153,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -178,6 +183,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &35618879 MeshFilter: m_ObjectHideFlags: 0 @@ -196,6 +202,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 10.2, y: 10.2, z: 10.2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1094236750} m_RootOrder: 0 @@ -232,6 +239,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -282,6 +290,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1849558962} m_RootOrder: 0 @@ -316,6 +325,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &831695287 MonoBehaviour: m_ObjectHideFlags: 0 @@ -331,6 +341,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.5} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -386,6 +398,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -406,6 +420,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 35618880} m_Father: {fileID: 1283967130} @@ -464,6 +479,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1094236750} m_Father: {fileID: 1849558962} @@ -536,6 +552,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -610,6 +627,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -690,6 +708,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1565827156 @@ -702,6 +721,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -735,6 +755,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 831695285} - {fileID: 1283967130} @@ -785,6 +806,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1849558965 Canvas: m_ObjectHideFlags: 0 @@ -803,6 +825,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 diff --git a/Samples/MarchingSquares/MarchingSquaresSettings.lighting b/Samples/MarchingSquares/MarchingSquaresSettings.lighting new file mode 100644 index 00000000..d1dfcf52 --- /dev/null +++ b/Samples/MarchingSquares/MarchingSquaresSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MarchingSquaresSettings + serializedVersion: 5 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 50 + m_Padding: 2 + m_LightmapCompression: 0 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 1 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/MarchingSquares/MarchingSquaresSettings.lighting.meta b/Samples/MarchingSquares/MarchingSquaresSettings.lighting.meta new file mode 100644 index 00000000..fcf188f0 --- /dev/null +++ b/Samples/MarchingSquares/MarchingSquaresSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 780e9b5262a56c34b9dca10ca41b89f5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/Mazes/Mazes.unity b/Samples/Mazes/Mazes.unity index 652713fc..64444f25 100644 --- a/Samples/Mazes/Mazes.unity +++ b/Samples/Mazes/Mazes.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: c34af91862931a54cbc410faca531755, + type: 2} --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -167,6 +170,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -200,6 +204,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1270936335} m_Father: {fileID: 1849558962} @@ -235,6 +240,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &831695287 MonoBehaviour: m_ObjectHideFlags: 0 @@ -250,6 +256,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.5} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -305,6 +313,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -325,6 +335,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1283967130} m_RootOrder: 0 @@ -383,6 +394,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1304763796} m_Father: {fileID: 831695285} @@ -418,6 +430,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1283967129 GameObject: m_ObjectHideFlags: 0 @@ -444,6 +457,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1094236750} m_Father: {fileID: 1849558962} @@ -482,6 +496,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1270936335} m_RootOrder: 0 @@ -529,6 +544,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1320898797 GameObject: m_ObjectHideFlags: 0 @@ -591,6 +607,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -665,6 +682,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -698,6 +716,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 831695285} - {fileID: 1283967130} @@ -748,6 +767,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1849558965 Canvas: m_ObjectHideFlags: 0 @@ -766,6 +786,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 diff --git a/Samples/Mazes/MazesSettings.lighting b/Samples/Mazes/MazesSettings.lighting new file mode 100644 index 00000000..0a540e85 --- /dev/null +++ b/Samples/Mazes/MazesSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MazesSettings + serializedVersion: 5 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 50 + m_Padding: 2 + m_LightmapCompression: 0 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 1 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/Mazes/MazesSettings.lighting.meta b/Samples/Mazes/MazesSettings.lighting.meta new file mode 100644 index 00000000..d183adca --- /dev/null +++ b/Samples/Mazes/MazesSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c34af91862931a54cbc410faca531755 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/Noise/Noise.unity b/Samples/Noise/Noise.unity index 6e11592f..73b29c3a 100644 --- a/Samples/Noise/Noise.unity +++ b/Samples/Noise/Noise.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: e2bda029f618e674ebbeefd0122d73ef, + type: 2} --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -183,6 +186,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -229,6 +233,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -303,6 +308,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -310,8 +316,7 @@ Transform: --- !u!1 &1079176261 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 120114, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -329,14 +334,14 @@ GameObject: --- !u!224 &1079176262 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22456224, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1079176261} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1885498104} m_RootOrder: 0 @@ -349,8 +354,7 @@ RectTransform: --- !u!114 &1079176263 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11433880, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1079176261} @@ -363,8 +367,7 @@ MonoBehaviour: --- !u!114 &1079176264 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11486456, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1079176261} @@ -386,6 +389,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1094236748 GameObject: m_ObjectHideFlags: 0 @@ -420,6 +424,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -440,6 +446,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1283967130} m_RootOrder: 0 @@ -497,6 +504,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1094236750} m_Father: {fileID: 1849558962} @@ -510,8 +518,7 @@ RectTransform: --- !u!1 &1785664459 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 188688, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -530,14 +537,14 @@ GameObject: --- !u!224 &1785664460 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22491358, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1785664459} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1885498104} m_Father: {fileID: 1849558962} @@ -551,8 +558,7 @@ RectTransform: --- !u!114 &1785664461 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11485248, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1785664459} @@ -574,6 +580,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &1785664462 MonoBehaviour: m_ObjectHideFlags: 0 @@ -589,6 +596,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.5} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -639,6 +648,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1785664460} - {fileID: 1283967130} @@ -689,6 +699,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1849558965 Canvas: m_ObjectHideFlags: 0 @@ -707,14 +718,14 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 --- !u!1 &1885498102 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 187044, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -731,8 +742,7 @@ GameObject: --- !u!114 &1885498103 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11411276, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1885498102} @@ -754,17 +764,18 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!224 &1885498104 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22493640, guid: f4b896867b7fe834ea64975d540d3ce5, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1885498102} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1079176262} m_Father: {fileID: 1785664460} diff --git a/Samples/Noise/NoiseSettings.lighting b/Samples/Noise/NoiseSettings.lighting new file mode 100644 index 00000000..620da72b --- /dev/null +++ b/Samples/Noise/NoiseSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NoiseSettings + serializedVersion: 5 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 50 + m_Padding: 2 + m_LightmapCompression: 0 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 1 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/Noise/NoiseSettings.lighting.meta b/Samples/Noise/NoiseSettings.lighting.meta new file mode 100644 index 00000000..be03d2c1 --- /dev/null +++ b/Samples/Noise/NoiseSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e2bda029f618e674ebbeefd0122d73ef +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/Primitives/Primitives.mat b/Samples/Primitives/Primitives.mat index e0d0395e..8e5ad2fd 100644 --- a/Samples/Primitives/Primitives.mat +++ b/Samples/Primitives/Primitives.mat @@ -2,24 +2,30 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Primitives m_Shader: {fileID: 4800000, guid: 40dd86119e3f8e74d8f7d84425c926aa, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: [] + m_Ints: [] m_Floats: - _Metallic: 0 - _Smoothness: 0 m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Samples/Primitives/Primitives.unity b/Samples/Primitives/Primitives.unity index 9df44b7d..5db2253b 100644 --- a/Samples/Primitives/Primitives.unity +++ b/Samples/Primitives/Primitives.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.7096061, g: 0.7096061, b: 0.7096061, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 6d84f972d1a6e0c46a30066637ff4c26, + type: 2} --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -150,6 +153,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 10 @@ -186,10 +190,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -214,6 +220,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &91037047 GameObject: m_ObjectHideFlags: 0 @@ -243,6 +250,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3, y: -3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 16 @@ -282,10 +290,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -310,6 +320,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &140426628 GameObject: m_ObjectHideFlags: 0 @@ -339,6 +350,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -6, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 0 @@ -377,10 +389,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -405,6 +419,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &162443169 GameObject: m_ObjectHideFlags: 0 @@ -431,6 +446,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 12 @@ -464,6 +480,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -9, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 6 @@ -503,10 +520,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -531,6 +550,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &409353593 GameObject: m_ObjectHideFlags: 0 @@ -560,6 +580,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 6, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 4 @@ -598,10 +619,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -626,6 +649,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &423463292 GameObject: m_ObjectHideFlags: 0 @@ -702,6 +726,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &423463294 @@ -714,6 +739,7 @@ Transform: m_LocalRotation: {x: 0.40821794, y: -0.23456973, z: 0.10938166, w: 0.8754261} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -747,6 +773,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 6, y: -3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 17 @@ -786,10 +813,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -814,6 +843,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &499955253 GameObject: m_ObjectHideFlags: 0 @@ -843,6 +873,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3, y: -3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 14 @@ -882,10 +913,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -910,6 +943,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &512307773 GameObject: m_ObjectHideFlags: 0 @@ -939,6 +973,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1226276357} m_RootOrder: 0 @@ -963,6 +998,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1036,6 +1073,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 2 @@ -1074,10 +1112,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1102,6 +1142,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &644687428 GameObject: m_ObjectHideFlags: 0 @@ -1129,6 +1170,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 140426629} - {fileID: 1672207373} @@ -1192,6 +1234,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -6, y: -3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 13 @@ -1231,10 +1274,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1259,6 +1304,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &793716195 GameObject: m_ObjectHideFlags: 0 @@ -1321,6 +1367,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -1354,6 +1401,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 9 @@ -1390,10 +1438,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1418,6 +1468,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1035654284 GameObject: m_ObjectHideFlags: 0 @@ -1444,6 +1495,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 5 @@ -1518,6 +1570,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1580,6 +1633,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1226276356 Canvas: m_ObjectHideFlags: 0 @@ -1598,6 +1652,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1611,6 +1666,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 512307774} m_Father: {fileID: 0} @@ -1650,6 +1706,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: -3, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 15 @@ -1689,10 +1746,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1717,6 +1776,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1611349192 GameObject: m_ObjectHideFlags: 0 @@ -1770,10 +1830,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1798,6 +1860,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &1611349196 Transform: m_ObjectHideFlags: 0 @@ -1808,6 +1871,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 3 @@ -1841,6 +1905,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 1 @@ -1879,10 +1944,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1907,6 +1974,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1691507009 GameObject: m_ObjectHideFlags: 0 @@ -1936,6 +2004,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 6, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 11 @@ -1974,10 +2043,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2002,6 +2073,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &2040988412 GameObject: m_ObjectHideFlags: 0 @@ -2031,6 +2103,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -6, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 7 @@ -2067,10 +2140,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2095,6 +2170,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &2138072843 GameObject: m_ObjectHideFlags: 0 @@ -2124,6 +2200,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 644687429} m_RootOrder: 8 @@ -2160,10 +2237,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2188,3 +2267,4 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Samples/Primitives/PrimitivesSettings.lighting b/Samples/Primitives/PrimitivesSettings.lighting new file mode 100644 index 00000000..75a10d0a --- /dev/null +++ b/Samples/Primitives/PrimitivesSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PrimitivesSettings + serializedVersion: 5 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 50 + m_Padding: 2 + m_LightmapCompression: 0 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 1 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/Primitives/PrimitivesSettings.lighting.meta b/Samples/Primitives/PrimitivesSettings.lighting.meta new file mode 100644 index 00000000..d8ec0553 --- /dev/null +++ b/Samples/Primitives/PrimitivesSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d84f972d1a6e0c46a30066637ff4c26 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/SDF/Animation.mat b/Samples/SDF/Animation.mat index 43c49b65..ca5a5e9b 100644 --- a/Samples/SDF/Animation.mat +++ b/Samples/SDF/Animation.mat @@ -2,20 +2,27 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Animation m_Shader: {fileID: 4800000, guid: 1aea65d08bd033b47b319a62ed056c89, type: 3} - m_ShaderKeywords: _DEBUG_ON _FRAC_ON _TOGGLE_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _DEBUG_ON + - _FRAC_ON + - _TOGGLE_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -23,6 +30,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: [] m_Colors: - _BackgroundColor: {r: 0.19607839, g: 0.04229141, b: 0.19393653, a: 1} @@ -30,3 +38,4 @@ Material: - _Color2: {r: 0.7826003, g: 0.78431374, b: 0.16916561, a: 1} - _Color3: {r: 0.16916552, g: 0.78431374, b: 0.37821305, a: 1} - _Color4: {r: 0.16916558, g: 0.7791732, b: 0.78431374, a: 1} + m_BuildTextureStacks: [] diff --git a/Samples/SDF/DistanceOperations.mat b/Samples/SDF/DistanceOperations.mat index f92da0d6..40bf286a 100644 --- a/Samples/SDF/DistanceOperations.mat +++ b/Samples/SDF/DistanceOperations.mat @@ -2,20 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: DistanceOperations m_Shader: {fileID: 4800000, guid: e230cf0790157f44ea0e4b6413621fea, type: 3} - m_ShaderKeywords: _DEBUG_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _DEBUG_ON + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -23,6 +28,8 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Debug: 1 m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Samples/SDF/Easing.mat b/Samples/SDF/Easing.mat index 981217d2..ce6797e9 100644 --- a/Samples/SDF/Easing.mat +++ b/Samples/SDF/Easing.mat @@ -2,20 +2,26 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Easing m_Shader: {fileID: 4800000, guid: bc95973503a3e374db32fdb2d91a8cdc, type: 3} - m_ShaderKeywords: _FRAC_ON _TOGGLE_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _FRAC_ON + - _TOGGLE_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -55,6 +61,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AA: 1 - _BumpScale: 1 @@ -97,3 +104,4 @@ Material: - _PlotColor: {r: 0.7826003, g: 0.78431374, b: 0.16916561, a: 1} - _PlusColor: {r: 1, g: 0.753, b: 0.753, a: 1} - _Vector: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/Samples/SDF/SDF.unity b/Samples/SDF/SDF.unity index ef25b3df..8ed77adb 100644 --- a/Samples/SDF/SDF.unity +++ b/Samples/SDF/SDF.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: c6ed69c85496fae418bc8a7dc3ea0ba2, + type: 2} --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -118,14 +119,15 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &534441600 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1999381561641676, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -144,14 +146,14 @@ GameObject: --- !u!224 &534441601 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224109479821778632, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534441600} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 681586227} m_RootOrder: 2 @@ -164,8 +166,7 @@ RectTransform: --- !u!114 &534441602 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114366259912235024, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534441600} @@ -179,8 +180,7 @@ MonoBehaviour: --- !u!222 &534441603 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 222072115299602860, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534441600} @@ -200,6 +200,8 @@ MonoBehaviour: m_Material: {fileID: 2100000, guid: 8b302e9dea4f84a4c8f51d6aab2c5f03, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -216,8 +218,7 @@ MonoBehaviour: --- !u!1 &664081067 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1697546302938192, guid: c1b5fbfb4bff75e4fae7695394c05541, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -235,8 +236,7 @@ GameObject: --- !u!114 &664081068 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114832780436194492, guid: c1b5fbfb4bff75e4fae7695394c05541, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 664081067} @@ -255,8 +255,7 @@ MonoBehaviour: --- !u!114 &664081069 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114771870438718994, guid: c1b5fbfb4bff75e4fae7695394c05541, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 664081067} @@ -271,14 +270,14 @@ MonoBehaviour: --- !u!4 &664081070 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4620261194556450, guid: c1b5fbfb4bff75e4fae7695394c05541, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 664081067} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -286,8 +285,7 @@ Transform: --- !u!1 &681586226 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1162032802069826, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -303,14 +301,14 @@ GameObject: --- !u!224 &681586227 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224921486445413698, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 681586226} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 781777385} - {fileID: 868614356} @@ -329,8 +327,7 @@ RectTransform: --- !u!1 &706040867 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1999381561641676, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -349,14 +346,14 @@ GameObject: --- !u!224 &706040868 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224109479821778632, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 706040867} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 681586227} m_RootOrder: 3 @@ -369,8 +366,7 @@ RectTransform: --- !u!114 &706040869 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114366259912235024, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 706040867} @@ -396,6 +392,8 @@ MonoBehaviour: m_Material: {fileID: 2100000, guid: 895c97baaf64dd945973553e9f1f05ca, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -412,8 +410,7 @@ MonoBehaviour: --- !u!222 &706040871 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 222072115299602860, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 706040867} @@ -421,8 +418,7 @@ CanvasRenderer: --- !u!1 &781777384 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1999381561641676, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -441,14 +437,14 @@ GameObject: --- !u!224 &781777385 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224109479821778632, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 781777384} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 681586227} m_RootOrder: 0 @@ -461,8 +457,7 @@ RectTransform: --- !u!114 &781777386 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114366259912235024, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 781777384} @@ -488,6 +483,8 @@ MonoBehaviour: m_Material: {fileID: 2100000, guid: 8636ac5021ec51f48844b1019d1fdc06, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -504,8 +501,7 @@ MonoBehaviour: --- !u!222 &781777388 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 222072115299602860, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 781777384} @@ -513,8 +509,7 @@ CanvasRenderer: --- !u!1 &868614355 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1999381561641676, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -533,14 +528,14 @@ GameObject: --- !u!224 &868614356 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224109479821778632, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 868614355} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 681586227} m_RootOrder: 1 @@ -553,8 +548,7 @@ RectTransform: --- !u!114 &868614357 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114366259912235024, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 868614355} @@ -568,8 +562,7 @@ MonoBehaviour: --- !u!222 &868614358 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 222072115299602860, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 868614355} @@ -589,6 +582,8 @@ MonoBehaviour: m_Material: {fileID: 2100000, guid: 1174b67f0c62652458346df24729b730, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -605,8 +600,7 @@ MonoBehaviour: --- !u!1 &1035647930 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1539539928869830, guid: f1d084f9a13cfc14c9afc2b6abf9b33a, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -624,8 +618,7 @@ GameObject: --- !u!114 &1035647931 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114403136078728676, guid: f1d084f9a13cfc14c9afc2b6abf9b33a, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1035647930} @@ -638,8 +631,7 @@ MonoBehaviour: --- !u!114 &1035647932 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114494793931437752, guid: f1d084f9a13cfc14c9afc2b6abf9b33a, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1035647930} @@ -661,17 +653,18 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!224 &1035647933 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224011489242670958, guid: f1d084f9a13cfc14c9afc2b6abf9b33a, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1035647930} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484331430} m_RootOrder: 0 @@ -684,8 +677,7 @@ RectTransform: --- !u!1 &1146778951 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1347100706239230, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -704,14 +696,14 @@ GameObject: --- !u!224 &1146778952 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224762360483785070, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1146778951} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1484331430} m_Father: {fileID: 1158104518} @@ -725,8 +717,7 @@ RectTransform: --- !u!114 &1146778953 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114863790121702684, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1146778951} @@ -748,11 +739,11 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &1146778954 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114025202065601244, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1146778951} @@ -764,6 +755,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.5} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -780,8 +773,7 @@ MonoBehaviour: --- !u!222 &1146778955 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 222386459227286412, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1146778951} @@ -789,8 +781,7 @@ CanvasRenderer: --- !u!1 &1158104514 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1182686189584546, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -811,8 +802,7 @@ GameObject: --- !u!114 &1158104515 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114969315499309216, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1158104514} @@ -829,8 +819,7 @@ MonoBehaviour: --- !u!114 &1158104516 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114375364253568354, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1158104514} @@ -849,11 +838,11 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1158104517 Canvas: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 223571176408913966, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1158104514} @@ -868,20 +857,21 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 --- !u!224 &1158104518 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224698425402638506, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1158104514} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1146778952} - {fileID: 681586227} @@ -929,8 +919,7 @@ MonoBehaviour: --- !u!1 &1270542517 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1999381561641676, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -949,14 +938,14 @@ GameObject: --- !u!224 &1270542518 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224109479821778632, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1270542517} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 681586227} m_RootOrder: 5 @@ -969,8 +958,7 @@ RectTransform: --- !u!114 &1270542519 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114366259912235024, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1270542517} @@ -996,6 +984,8 @@ MonoBehaviour: m_Material: {fileID: 2100000, guid: cb2d5fdbda83f08438d1bd19f1c715e1, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1012,8 +1002,7 @@ MonoBehaviour: --- !u!222 &1270542521 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 222072115299602860, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1270542517} @@ -1021,8 +1010,7 @@ CanvasRenderer: --- !u!1 &1445729134 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1999381561641676, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -1041,14 +1029,14 @@ GameObject: --- !u!224 &1445729135 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224109479821778632, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1445729134} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 681586227} m_RootOrder: 4 @@ -1061,8 +1049,7 @@ RectTransform: --- !u!114 &1445729136 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114366259912235024, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1445729134} @@ -1088,6 +1075,8 @@ MonoBehaviour: m_Material: {fileID: 2100000, guid: a161b451dc7602f48b4fa958f8c12737, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1104,8 +1093,7 @@ MonoBehaviour: --- !u!222 &1445729138 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 222072115299602860, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1445729134} @@ -1113,8 +1101,7 @@ CanvasRenderer: --- !u!1 &1484331429 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1344383836760772, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -1131,14 +1118,14 @@ GameObject: --- !u!224 &1484331430 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224581381078792632, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484331429} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1035647933} m_Father: {fileID: 1146778952} @@ -1152,8 +1139,7 @@ RectTransform: --- !u!114 &1484331431 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114080277721321458, guid: cb24496475061384c887fdf1a6db9946, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484331429} @@ -1175,11 +1161,11 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1830949440 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1196691573632616, guid: dd9b46c7f04e4b942add36ff4339ef99, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -1196,8 +1182,7 @@ GameObject: --- !u!20 &1830949441 Camera: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 20779228610377050, guid: dd9b46c7f04e4b942add36ff4339ef99, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1830949440} @@ -1240,14 +1225,14 @@ Camera: --- !u!4 &1830949442 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4907719795763662, guid: dd9b46c7f04e4b942add36ff4339ef99, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1830949440} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Samples/SDF/SDFSettings.lighting b/Samples/SDF/SDFSettings.lighting new file mode 100644 index 00000000..bcedb887 --- /dev/null +++ b/Samples/SDF/SDFSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SDFSettings + serializedVersion: 5 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 50 + m_Padding: 2 + m_LightmapCompression: 0 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 1 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/SDF/SDFSettings.lighting.meta b/Samples/SDF/SDFSettings.lighting.meta new file mode 100644 index 00000000..c7181c42 --- /dev/null +++ b/Samples/SDF/SDFSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c6ed69c85496fae418bc8a7dc3ea0ba2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/SDF/Shapes.mat b/Samples/SDF/Shapes.mat index 4d2b810f..a2c62d4e 100644 --- a/Samples/SDF/Shapes.mat +++ b/Samples/SDF/Shapes.mat @@ -2,20 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Shapes m_Shader: {fileID: 4800000, guid: 96684dd9c99bc3942b6f7dbfdbf39b76, type: 3} - m_ShaderKeywords: _DEBUG_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _DEBUG_ON + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -23,6 +28,8 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Debug: 1 m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Samples/SDF/StarPolygon.mat b/Samples/SDF/StarPolygon.mat index ff332a55..b70bfbbc 100644 --- a/Samples/SDF/StarPolygon.mat +++ b/Samples/SDF/StarPolygon.mat @@ -2,20 +2,27 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: StarPolygon m_Shader: {fileID: 4800000, guid: 77be9e7d3d44c7645a22e5179cb3a7fe, type: 3} - m_ShaderKeywords: _DEBUG_ON _FRAC_ON _TOGGLE_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _DEBUG_ON + m_InvalidKeywords: + - _FRAC_ON + - _TOGGLE_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -23,9 +30,11 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Cheap: 0 - _Debug: 1 - _OffsetAngle: 36 - _Vertices: 5 m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Samples/SDF/Transitions.mat b/Samples/SDF/Transitions.mat index 3124aabf..9fa9990d 100644 --- a/Samples/SDF/Transitions.mat +++ b/Samples/SDF/Transitions.mat @@ -2,20 +2,26 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Transitions m_Shader: {fileID: 4800000, guid: 6e6a7519945c334448a3b1764edbab52, type: 3} - m_ShaderKeywords: _FRAC_ON _TOGGLE_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _FRAC_ON + - _TOGGLE_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -23,6 +29,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Debug: 0 m_Colors: @@ -31,3 +38,4 @@ Material: - _Color2: {r: 0.7826003, g: 0.78431374, b: 0.16916561, a: 1} - _Color3: {r: 0.16916552, g: 0.78431374, b: 0.37821305, a: 1} - _Color4: {r: 0.16916558, g: 0.7791732, b: 0.78431374, a: 1} + m_BuildTextureStacks: [] diff --git a/Samples/StraightSkeleton/StraightSkeletonExample.unity b/Samples/StraightSkeleton/StraightSkeletonExample.unity index 3d0bbdfe..7b86c594 100644 --- a/Samples/StraightSkeleton/StraightSkeletonExample.unity +++ b/Samples/StraightSkeleton/StraightSkeletonExample.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 7cd588ec3a7ec3748b7cf4a7b5c24346, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -160,6 +163,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -234,6 +238,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Samples/StraightSkeleton/StraightSkeletonExampleSettings.lighting b/Samples/StraightSkeleton/StraightSkeletonExampleSettings.lighting new file mode 100644 index 00000000..f9deaa7f --- /dev/null +++ b/Samples/StraightSkeleton/StraightSkeletonExampleSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: StraightSkeletonExampleSettings + serializedVersion: 5 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/StraightSkeleton/StraightSkeletonExampleSettings.lighting.meta b/Samples/StraightSkeleton/StraightSkeletonExampleSettings.lighting.meta new file mode 100644 index 00000000..5f779f53 --- /dev/null +++ b/Samples/StraightSkeleton/StraightSkeletonExampleSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7cd588ec3a7ec3748b7cf4a7b5c24346 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/Tessellator/TessellatorExample.unity b/Samples/Tessellator/TessellatorExample.unity index fd97c3dd..94097d11 100644 --- a/Samples/Tessellator/TessellatorExample.unity +++ b/Samples/Tessellator/TessellatorExample.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 85b86476653957649a2cc4448aaf660d, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -162,6 +165,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -236,6 +240,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -269,10 +274,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -297,6 +304,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1363503576 MeshFilter: m_ObjectHideFlags: 0 @@ -315,6 +323,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -338,6 +347,7 @@ GameObject: m_IsActive: 1 --- !u!120 &1805424938 LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -347,10 +357,12 @@ LineRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -427,10 +439,13 @@ LineRenderer: numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0 generateLightingData: 0 + m_MaskInteraction: 0 m_UseWorldSpace: 1 m_Loop: 1 + m_ApplyActiveColorSpace: 0 --- !u!4 &1805424939 Transform: m_ObjectHideFlags: 0 @@ -441,6 +456,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 diff --git a/Samples/Tessellator/TessellatorExampleSettings.lighting b/Samples/Tessellator/TessellatorExampleSettings.lighting new file mode 100644 index 00000000..1099a379 --- /dev/null +++ b/Samples/Tessellator/TessellatorExampleSettings.lighting @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TessellatorExampleSettings + serializedVersion: 5 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 diff --git a/Samples/Tessellator/TessellatorExampleSettings.lighting.meta b/Samples/Tessellator/TessellatorExampleSettings.lighting.meta new file mode 100644 index 00000000..d10c817d --- /dev/null +++ b/Samples/Tessellator/TessellatorExampleSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85b86476653957649a2cc4448aaf660d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/Tessellator/Unlit.mat b/Samples/Tessellator/Unlit.mat index dbb29fe0..9e1251ba 100644 --- a/Samples/Tessellator/Unlit.mat +++ b/Samples/Tessellator/Unlit.mat @@ -2,23 +2,29 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Unlit m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: [] + m_Ints: [] m_Floats: [] m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Shaders/Common.cginc.meta b/Shaders/Common.cginc.meta index 9419e31f..a3eb4909 100644 --- a/Shaders/Common.cginc.meta +++ b/Shaders/Common.cginc.meta @@ -1,9 +1,7 @@ fileFormatVersion: 2 guid: 01748d5f004612245a5fb7680e82312e -ShaderImporter: +ShaderIncludeImporter: externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/Shaders/Easing.cginc.meta b/Shaders/Easing.cginc.meta index 305e4bbc..dc29e021 100644 --- a/Shaders/Easing.cginc.meta +++ b/Shaders/Easing.cginc.meta @@ -1,9 +1,7 @@ fileFormatVersion: 2 guid: f325f18ad4d822f47a69af8bb294fd0f -ShaderImporter: +ShaderIncludeImporter: externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/Shaders/SDF.cginc.meta b/Shaders/SDF.cginc.meta index c1e16c32..d63e910b 100644 --- a/Shaders/SDF.cginc.meta +++ b/Shaders/SDF.cginc.meta @@ -1,9 +1,7 @@ fileFormatVersion: 2 guid: 19ebf1c7bc49af24784bebd78fe1d750 -ShaderImporter: +ShaderIncludeImporter: externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/Shaders/Transitions.cginc.meta b/Shaders/Transitions.cginc.meta index 2882b89e..d75cdd84 100644 --- a/Shaders/Transitions.cginc.meta +++ b/Shaders/Transitions.cginc.meta @@ -1,9 +1,7 @@ fileFormatVersion: 2 guid: df7676e09eb31ca47a7dccca064e5d65 -ShaderImporter: +ShaderIncludeImporter: externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: