Skip to content

Commit 0815775

Browse files
ciro-unityciro-unity
committed
Relocated lighting settings
1 parent 3c0b1eb commit 0815775

File tree

12 files changed

+159
-102
lines changed

12 files changed

+159
-102
lines changed

‎UOP1_Project/Assets/Scenes/Locations/EmptyLocation.unity

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.15172704, g: 0.34956533, b: 0.7081114, a: 1}
41+
m_IndirectSpecularColor: {r: 0.15425776, g: 0.3523173, b: 0.7075843, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
4545
m_ObjectHideFlags: 0
46-
serializedVersion: 11
46+
serializedVersion: 12
4747
m_GIWorkflowMode: 1
4848
m_GISettings:
4949
serializedVersion: 2
@@ -99,7 +99,8 @@ LightmapSettings:
9999
m_LightProbeSampleCountMultiplier: 4
100100
m_LightingDataAsset: {fileID: 112000000, guid: 6ae0524cf947c644bb3a5860dc14cc82,
101101
type: 2}
102-
m_UseShadowmask: 0
102+
m_LightingSettings: {fileID: 4890085278179872738, guid: 52681ab8c7077404792ac20ee851382d,
103+
type: 2}
103104
--- !u!196 &4
104105
NavMeshSettings:
105106
serializedVersion: 2
@@ -119,6 +120,8 @@ NavMeshSettings:
119120
manualTileSize: 0
120121
tileSize: 256
121122
accuratePlacement: 0
123+
maxJobWorkers: 0
124+
preserveTilesOutsideBounds: 0
122125
debug:
123126
m_Flags: 0
124127
m_NavMeshData: {fileID: 0}
@@ -170,6 +173,7 @@ MeshRenderer:
170173
m_LightProbeUsage: 1
171174
m_ReflectionProbeUsage: 1
172175
m_RayTracingMode: 2
176+
m_RayTraceProcedural: 0
173177
m_RenderingLayerMask: 1
174178
m_RendererPriority: 0
175179
m_Materials:
@@ -194,6 +198,7 @@ MeshRenderer:
194198
m_SortingLayerID: 0
195199
m_SortingLayer: 0
196200
m_SortingOrder: 0
201+
m_AdditionalVertexStreams: {fileID: 0}
197202
--- !u!33 &59229079
198203
MeshFilter:
199204
m_ObjectHideFlags: 0
@@ -542,8 +547,9 @@ Light:
542547
m_BounceIntensity: 1
543548
m_ColorTemperature: 6570
544549
m_UseColorTemperature: 0
545-
m_BoundingSphereOverride: {x: 0, y: 9.534e-42, z: 0, w: 0}
550+
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 42.629272}
546551
m_UseBoundingSphereOverride: 0
552+
m_UseViewFrustumForShadowCasterCull: 1
547553
m_ShadowRadius: 0
548554
m_ShadowAngle: 0
549555
--- !u!4 &804472775
@@ -644,6 +650,11 @@ PrefabInstance:
644650
propertyPath: m_LocalPosition.z
645651
value: 0
646652
objectReference: {fileID: 0}
653+
- target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e,
654+
type: 3}
655+
propertyPath: m_LocalRotation.w
656+
value: 0.973249
657+
objectReference: {fileID: 0}
647658
- target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e,
648659
type: 3}
649660
propertyPath: m_LocalRotation.x
@@ -664,6 +675,11 @@ PrefabInstance:
664675
propertyPath: m_LocalPosition.z
665676
value: 0
666677
objectReference: {fileID: 0}
678+
- target: {fileID: 2808035858438402709, guid: 45632f0a227c860489bcba0eb1f4ec3e,
679+
type: 3}
680+
propertyPath: m_LocalRotation.w
681+
value: 0.973249
682+
objectReference: {fileID: 0}
667683
- target: {fileID: 2808035858438402709, guid: 45632f0a227c860489bcba0eb1f4ec3e,
668684
type: 3}
669685
propertyPath: m_LocalRotation.x
@@ -707,12 +723,12 @@ PrefabInstance:
707723
- target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e,
708724
type: 3}
709725
propertyPath: m_LocalRotation.y
710-
value: -5.587449e-29
726+
value: -1e-45
711727
objectReference: {fileID: 0}
712728
- target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e,
713729
type: 3}
714730
propertyPath: m_LocalRotation.z
715-
value: 1.0459811e-29
731+
value: -0
716732
objectReference: {fileID: 0}
717733
- target: {fileID: 8745341640208226293, guid: 45632f0a227c860489bcba0eb1f4ec3e,
718734
type: 3}
@@ -794,6 +810,11 @@ PrefabInstance:
794810
propertyPath: m_LocalPosition.z
795811
value: -12
796812
objectReference: {fileID: 0}
813+
- target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e,
814+
type: 3}
815+
propertyPath: m_LocalRotation.w
816+
value: 0.973249
817+
objectReference: {fileID: 0}
797818
- target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e,
798819
type: 3}
799820
propertyPath: m_LocalRotation.x

‎UOP1_Project/Assets/Scenes/Locations/EmptyLocation/LightingData.asset

0 Bytes
Binary file not shown.

‎UOP1_Project/Assets/Scenes/Locations/EmptyLocation/Lightmap-0_comp_light.exr

423 Bytes
Binary file not shown.

‎UOP1_Project/Assets/Scenes/Locations/Forest.unity

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RenderSettings:
4343
--- !u!157 &3
4444
LightmapSettings:
4545
m_ObjectHideFlags: 0
46-
serializedVersion: 11
46+
serializedVersion: 12
4747
m_GIWorkflowMode: 1
4848
m_GISettings:
4949
serializedVersion: 2
@@ -99,7 +99,8 @@ LightmapSettings:
9999
m_LightProbeSampleCountMultiplier: 4
100100
m_LightingDataAsset: {fileID: 112000000, guid: 877753fe7cc68f64ca1bff50ea9eb298,
101101
type: 2}
102-
m_UseShadowmask: 0
102+
m_LightingSettings: {fileID: 4890085278179872738, guid: 52681ab8c7077404792ac20ee851382d,
103+
type: 2}
103104
--- !u!196 &4
104105
NavMeshSettings:
105106
serializedVersion: 2
@@ -119,6 +120,8 @@ NavMeshSettings:
119120
manualTileSize: 0
120121
tileSize: 256
121122
accuratePlacement: 0
123+
maxJobWorkers: 0
124+
preserveTilesOutsideBounds: 0
122125
debug:
123126
m_Flags: 0
124127
m_NavMeshData: {fileID: 0}
@@ -890,6 +893,7 @@ MeshRenderer:
890893
m_LightProbeUsage: 1
891894
m_ReflectionProbeUsage: 1
892895
m_RayTracingMode: 2
896+
m_RayTraceProcedural: 0
893897
m_RenderingLayerMask: 1
894898
m_RendererPriority: 0
895899
m_Materials:
@@ -914,6 +918,7 @@ MeshRenderer:
914918
m_SortingLayerID: 0
915919
m_SortingLayer: 0
916920
m_SortingOrder: 0
921+
m_AdditionalVertexStreams: {fileID: 0}
917922
--- !u!33 &284272968
918923
MeshFilter:
919924
m_ObjectHideFlags: 0
@@ -2208,6 +2213,7 @@ Light:
22082213
m_UseColorTemperature: 0
22092214
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
22102215
m_UseBoundingSphereOverride: 0
2216+
m_UseViewFrustumForShadowCasterCull: 1
22112217
m_ShadowRadius: 0
22122218
m_ShadowAngle: 0
22132219
--- !u!4 &804472775
@@ -3342,6 +3348,7 @@ MeshRenderer:
33423348
m_LightProbeUsage: 1
33433349
m_ReflectionProbeUsage: 1
33443350
m_RayTracingMode: 2
3351+
m_RayTraceProcedural: 0
33453352
m_RenderingLayerMask: 1
33463353
m_RendererPriority: 0
33473354
m_Materials:
@@ -3366,6 +3373,7 @@ MeshRenderer:
33663373
m_SortingLayerID: 0
33673374
m_SortingLayer: 0
33683375
m_SortingOrder: 0
3376+
m_AdditionalVertexStreams: {fileID: 0}
33693377
--- !u!33 &1406036544
33703378
MeshFilter:
33713379
m_ObjectHideFlags: 0

‎UOP1_Project/Assets/Scenes/Locations/Glade.unity

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ LightmapSettings:
9999
m_LightProbeSampleCountMultiplier: 4
100100
m_LightingDataAsset: {fileID: 112000000, guid: c3913723b7bf6b142a8b67d27c5b0761,
101101
type: 2}
102-
m_LightingSettings: {fileID: 4890085278179872738, guid: 0e9ba25cdacae1b4c975fad5777ae2d3,
102+
m_LightingSettings: {fileID: 4890085278179872738, guid: 52681ab8c7077404792ac20ee851382d,
103103
type: 2}
104104
--- !u!196 &4
105105
NavMeshSettings:

‎UOP1_Project/Assets/Scenes/Locations/GladeSettings.lighting

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎UOP1_Project/Assets/Scenes/Locations/GladeSettings.lighting.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)