r.nikolin
/
rabidus-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/hdrp' into hdrp

This commit is contained in:
Алексей Козлов 2023-10-26 14:44:28 +03:00
parent 52a6ecdfb5 8ca90d9ae5
commit a3105ef300
17 changed files with 3585 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset
View File

@ -18,8 +18,8 @@ MonoBehaviour:
type: 2}
m_RenderingPathDefaultCameraFrameSettings:
bitDatas:
data1: 72198260625768269
data2: 13763000477350330392
data1: 140666587840333
data2: 13763000470907879448
lodBias: 1
lodBiasMode: 0
lodBiasQualityLevel: 0
@ -33,8 +33,8 @@ MonoBehaviour:
materialQuality: 0
m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings:
bitDatas:
data1: 135310754214733
data2: 4539628428684460056
data1: 135310754214669
data2: 4539628424389492760
lodBias: 1
lodBiasMode: 0
lodBiasQualityLevel: 0
@ -48,8 +48,8 @@ MonoBehaviour:
materialQuality: 0
m_RenderingPathDefaultRealtimeReflectionFrameSettings:
bitDatas:
data1: 139923391782733
data2: 13763000465807638544
data1: 139927820964621
data2: 13763000461244235800
lodBias: 1
lodBiasMode: 0
lodBiasQualityLevel: 0

55
Assets/HDRPDefaultResources/RaceSettingsVolumeProfile.asset
View File

@ -95,7 +95,7 @@ MonoBehaviour:
m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1}
tint:
m_OverrideState: 1
m_Value: {r: 0.73945355, g: 0.7717159, b: 0.8207547, a: 1}
m_Value: {r: 0.5735137, g: 0.61316305, b: 0.6792453, a: 1}
maxFogDistance:
m_OverrideState: 1
m_Value: 9000
@ -156,6 +156,40 @@ MonoBehaviour:
directionalLightsOnly:
m_OverrideState: 0
m_Value: 0
--- !u!114 &-1728042039599633278
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b24b200358312b4fa1004e2431c2f1f, type: 3}
m_Name: ShadowsMidtonesHighlights
m_EditorClassIdentifier:
active: 1
shadows:
m_OverrideState: 0
m_Value: {x: 1, y: 1, z: 1, w: -0.10169492}
midtones:
m_OverrideState: 1
m_Value: {x: 0.95224893, y: 0.94751924, z: 1, w: -0.15593222}
highlights:
m_OverrideState: 0
m_Value: {x: 1, y: 1, z: 1, w: 0}
shadowsStart:
m_OverrideState: 0
m_Value: 0
shadowsEnd:
m_OverrideState: 1
m_Value: 0.3
highlightsStart:
m_OverrideState: 1
m_Value: 0.52
highlightsEnd:
m_OverrideState: 1
m_Value: 0.8
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@ -178,9 +212,10 @@ MonoBehaviour:
- {fileID: 7542669330009093999}
- {fileID: 5315503232242033309}
- {fileID: 3259324419836485081}
- {fileID: -7089757308646879465}
- {fileID: 1501199423866068322}
- {fileID: -7089757308646879465}
- {fileID: -7355434187109075157}
- {fileID: -1728042039599633278}
--- !u!114 &342605110984153383
MonoBehaviour:
m_ObjectHideFlags: 3
@ -421,10 +456,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b51a78e223a2e504bb88a059b55229ea, type: 3}
m_Name: WhiteBalance
m_EditorClassIdentifier:
active: 1
active: 0
temperature:
m_OverrideState: 1
m_Value: 0
m_Value: 8
tint:
m_OverrideState: 0
m_Value: 0
@ -761,7 +796,7 @@ MonoBehaviour:
active: 1
maxShadowDistance:
m_OverrideState: 1
m_Value: 8000
m_Value: 12168
directionalTransmissionMultiplier:
m_OverrideState: 0
m_Value: 1
@ -770,22 +805,22 @@ MonoBehaviour:
m_Value: 3
cascadeShadowSplit0:
m_OverrideState: 1
m_Value: 0.15718418
m_Value: 0.046368606
cascadeShadowSplit1:
m_OverrideState: 1
m_Value: 0.4126935
m_Value: 0.1291399
cascadeShadowSplit2:
m_OverrideState: 0
m_Value: 0.49835134
cascadeShadowBorder0:
m_OverrideState: 1
m_Value: 0.820513
m_Value: 0.74358976
cascadeShadowBorder1:
m_OverrideState: 1
m_Value: 0.6260073
m_Value: 0.5008914
cascadeShadowBorder2:
m_OverrideState: 1
m_Value: 0.3792603
m_Value: 0.6618913
cascadeShadowBorder3:
m_OverrideState: 0
m_Value: 0

8
Assets/Models/ModernTown/Atrium.fbx.meta
View File

@ -52,7 +52,7 @@ ModelImporter:
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
generateSecondaryUV: 1
useFileUnits: 1
keepQuads: 0
weldVertices: 1
@ -65,11 +65,11 @@ ModelImporter:
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVAreaDistortion: 15
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVMinLightmapResolution: 14
secondaryUVMinObjectScale: 0.01
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:

24
Assets/Prefabs/Environment.prefab
View File

@ -11948,7 +11948,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Intensity: 110000
m_Intensity: 100000
m_EnableSpotReflector: 1
m_LuxAtDistance: 1
m_InnerSpotPercent: 0
@ -11984,7 +11984,7 @@ MonoBehaviour:
m_FlareFalloff: 8
m_SurfaceTexture: {fileID: 0}
m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1}
m_Distance: 1.5082648e+11
m_Distance: 150000000
m_UseRayTracedShadows: 0
m_NumRayTracingSamples: 4
m_FilterTracedShadow: 1
@ -12480,6 +12480,11 @@ PrefabInstance:
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: e863e485a4d0bf94689e6f54f429d444,
type: 3}
propertyPath: m_ScaleInLightmap
value: 0.001
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: e863e485a4d0bf94689e6f54f429d444,
type: 3}
propertyPath: m_StaticShadowCaster
@ -13520,11 +13525,26 @@ PrefabInstance:
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: dfe87a56d4d1180438d47e9428bbf32f,
type: 3}
propertyPath: m_ScaleInLightmap
value: 0.001
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: dfe87a56d4d1180438d47e9428bbf32f,
type: 3}
propertyPath: m_StaticShadowCaster
value: 1
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: dfe87a56d4d1180438d47e9428bbf32f,
type: 3}
propertyPath: m_Name
value: Atrium
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: dfe87a56d4d1180438d47e9428bbf32f,
type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dfe87a56d4d1180438d47e9428bbf32f, type: 3}
--- !u!4 &6411663887651714916 stripped

64
Assets/Scenes/LightSettings.lighting Normal file
View File

@ -0,0 +1,64 @@
%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: LightSettings
serializedVersion: 4
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: 2
m_LightmapMaxSize: 2048
m_BakeResolution: 28
m_Padding: 3
m_LightmapCompression: 0
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAO: 0
m_MixedBakeMode: 0
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: 0
m_PVRSampling: 1
m_PVRDirectSampleCount: 1
m_PVRSampleCount: 256
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_LightProbeSampleCountMultiplier: 4
m_PVRBounces: 2
m_PVRMinBounces: 2
m_PVREnvironmentMIS: 0
m_PVRFilteringMode: 2
m_PVRDenoiserTypeDirect: 2
m_PVRDenoiserTypeIndirect: 2
m_PVRDenoiserTypeAO: 0
m_PVRFilterTypeDirect: 2
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 1
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_PVRTiledBaking: 0

8
Assets/Scenes/LightSettings.lighting.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fdab9a2c0b7dff54f8b1c90b54916ad8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 4890085278179872738
userData:
assetBundleName:
assetBundleVariant:

3632
Assets/Scenes/Monument_Debug2.unity
View File

File diff suppressed because one or more lines are too long

2
Assets/_Monuments/Prefabs/Big/Monument_1.prefab
View File

@ -70,7 +70,7 @@ PrefabInstance:
- target: {fileID: 919132149155446097, guid: 7722d335bcf89bf45938d3996631a16b,
type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7722d335bcf89bf45938d3996631a16b, type: 3}

2
Assets/_Monuments/Prefabs/Big/Monument_10.prefab
View File

@ -95,7 +95,7 @@ PrefabInstance:
- target: {fileID: 919132149155446097, guid: 9c87cbf02bdaeb848a5c66739eae4dbf,
type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9c87cbf02bdaeb848a5c66739eae4dbf, type: 3}

2
Assets/_Monuments/Prefabs/Big/Monument_3.prefab
View File

@ -251,7 +251,7 @@ PrefabInstance:
- target: {fileID: 919132149155446097, guid: 335d4d2a469dd40499dbb4e50191ade0,
type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 335d4d2a469dd40499dbb4e50191ade0, type: 3}

26
Assets/_Monuments/Prefabs/Big/Monument_4.prefab
View File

@ -85,7 +85,7 @@ PrefabInstance:
- target: {fileID: 919132149155446097, guid: e3476c07aede2dd4f9290c5127399c75,
type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e3476c07aede2dd4f9290c5127399c75, type: 3}
@ -117,15 +117,35 @@ PrefabInstance:
propertyPath: _fromValue
value: -1
objectReference: {fileID: 0}
- target: {fileID: 973251640766518884, guid: f7c18ea67fe64514a8e28b62367e16f7,
type: 3}
propertyPath: m_LocalScale.x
value: 3821.0002
objectReference: {fileID: 0}
- target: {fileID: 973251640766518884, guid: f7c18ea67fe64514a8e28b62367e16f7,
type: 3}
propertyPath: m_LocalScale.y
value: 1209.3007
objectReference: {fileID: 0}
- target: {fileID: 973251640766518884, guid: f7c18ea67fe64514a8e28b62367e16f7,
type: 3}
propertyPath: m_LocalScale.z
value: 3821.0002
objectReference: {fileID: 0}
- target: {fileID: 973251640766518884, guid: f7c18ea67fe64514a8e28b62367e16f7,
type: 3}
propertyPath: m_LocalPosition.x
value: -45
value: -38
objectReference: {fileID: 0}
- target: {fileID: 973251640766518884, guid: f7c18ea67fe64514a8e28b62367e16f7,
type: 3}
propertyPath: m_LocalPosition.y
value: -1399
value: -1577
objectReference: {fileID: 0}
- target: {fileID: 973251640766518884, guid: f7c18ea67fe64514a8e28b62367e16f7,
type: 3}
propertyPath: m_LocalPosition.z
value: -28
objectReference: {fileID: 0}
- target: {fileID: 1292573131802250242, guid: f7c18ea67fe64514a8e28b62367e16f7,
type: 3}

2
Assets/_Monuments/Prefabs/Big/Monument_5.prefab
View File

@ -85,7 +85,7 @@ PrefabInstance:
- target: {fileID: 919132149155446097, guid: 844340a4b70f1a746a4a076b8a4c90c0,
type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 844340a4b70f1a746a4a076b8a4c90c0, type: 3}

2
Assets/_Monuments/Prefabs/Big/Monument_6.prefab
View File

@ -70,7 +70,7 @@ PrefabInstance:
- target: {fileID: 919132149155446097, guid: 4b6282463a164d445989102ebb6ac598,
type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4b6282463a164d445989102ebb6ac598, type: 3}

2
Assets/_Monuments/Prefabs/Big/Monument_7.prefab
View File

@ -246,7 +246,7 @@ PrefabInstance:
- target: {fileID: 919132149155446097, guid: 65613d5a45a345740b13945202817014,
type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 65613d5a45a345740b13945202817014, type: 3}

2
Assets/_Monuments/Prefabs/Big/Monument_8.prefab
View File

@ -261,7 +261,7 @@ PrefabInstance:
- target: {fileID: 919132149155446097, guid: 30e4cadc57421864eaf0ccdb00f5377d,
type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 30e4cadc57421864eaf0ccdb00f5377d, type: 3}

2
Assets/_Monuments/Prefabs/Big/Monument_9.prefab
View File

@ -85,7 +85,7 @@ PrefabInstance:
- target: {fileID: 919132149155446097, guid: 4c412179209c95b4fb051077867400f1,
type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4c412179209c95b4fb051077867400f1, type: 3}

15
Assets/_Monuments/Prefabs/Big/Monument_Origin.prefab
View File

@ -338,6 +338,16 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 5ef4186f269b2c04c865e865716c1da0,
type: 3}
propertyPath: m_ReceiveGI
value: 2
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: b05aeaed0e2590f4d9aa946531bb6552,
type: 3}
propertyPath: m_LightProbeUsage
value: 2
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: b05aeaed0e2590f4d9aa946531bb6552,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 0b746badcf58ef24692612bf34f836c8, type: 2}
@ -346,6 +356,11 @@ PrefabInstance:
propertyPath: m_Name
value: under_of_monument 2
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: b05aeaed0e2590f4d9aa946531bb6552,
type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5ef4186f269b2c04c865e865716c1da0, type: 3}
--- !u!4 &4421202291124940304 stripped