feat&bugfix: Fog 버그 수정 및 적용 (#173)

* edit method, field names * feat&bugfix: light occlusion culling for fixing fog bug
kookmin-sw · Jun 30, 2024 · 69d0293 · 69d0293
1 parent 9c48885
commit 69d0293
Show file tree

Hide file tree

Showing 38 changed files with 257 additions and 100 deletions.
diff --git a/Client/Assets/Resources/Prefabs/Map/Map.prefab b/Client/Assets/Resources/Prefabs/Map/Map.prefab
@@ -6926,10 +6926,6 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 2558770651188516899}
     m_Modifications:
-    - target: {fileID: -1894697666103748573, guid: 025466fda43d46442882ff7fd95e507a, type: 3}
-      propertyPath: Flags
-      value: 262145
-      objectReference: {fileID: 0}
     - target: {fileID: -1894697666103748573, guid: 025466fda43d46442882ff7fd95e507a, type: 3}
       propertyPath: SortKey
       value: 2378540302
@@ -6988,6 +6984,16 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 1539154013082283473, guid: 025466fda43d46442882ff7fd95e507a, type: 3}
   m_PrefabInstance: {fileID: 1449006274377380312}
   m_PrefabAsset: {fileID: 0}
+--- !u!108 &810170552861159544 stripped
+Light:
+  m_CorrespondingSourceObject: {fileID: 2244387270546555296, guid: 025466fda43d46442882ff7fd95e507a, type: 3}
+  m_PrefabInstance: {fileID: 1449006274377380312}
+  m_PrefabAsset: {fileID: 0}
+--- !u!108 &8052855157737000666 stripped
+Light:
+  m_CorrespondingSourceObject: {fileID: 8924615615604686594, guid: 025466fda43d46442882ff7fd95e507a, type: 3}
+  m_PrefabInstance: {fileID: 1449006274377380312}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1466805195902424386
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -18449,6 +18455,46 @@ PrefabInstance:
       propertyPath: SortKey
       value: 299359266
       objectReference: {fileID: 0}
+    - target: {fileID: 2182321055254443742, guid: bab680a9e6239f7469c10b63df86d291, type: 3}
+      propertyPath: _additionalLightEnableTargets.Array.data[0]
+      value: 
+      objectReference: {fileID: 1941197670452631161}
+    - target: {fileID: 2182321055254443742, guid: bab680a9e6239f7469c10b63df86d291, type: 3}
+      propertyPath: _additionalLightEnableTargets.Array.data[1]
+      value: 
+      objectReference: {fileID: 360064592309782731}
+    - target: {fileID: 2182321055254443742, guid: bab680a9e6239f7469c10b63df86d291, type: 3}
+      propertyPath: _additionalLightEnableTargets.Array.data[2]
+      value: 
+      objectReference: {fileID: 5846139990651323165}
+    - target: {fileID: 2182321055254443742, guid: bab680a9e6239f7469c10b63df86d291, type: 3}
+      propertyPath: _additionalLightEnableTargets.Array.data[3]
+      value: 
+      objectReference: {fileID: 7075559330935866365}
+    - target: {fileID: 2182321055254443742, guid: bab680a9e6239f7469c10b63df86d291, type: 3}
+      propertyPath: _additionalLightEnableTargets.Array.data[4]
+      value: 
+      objectReference: {fileID: 4832004871745595133}
+    - target: {fileID: 2182321055254443742, guid: bab680a9e6239f7469c10b63df86d291, type: 3}
+      propertyPath: _additionalLightEnableTargets.Array.data[5]
+      value: 
+      objectReference: {fileID: 6755838309109644512}
+    - target: {fileID: 2182321055254443742, guid: bab680a9e6239f7469c10b63df86d291, type: 3}
+      propertyPath: _additionalLightEnableTargets.Array.data[6]
+      value: 
+      objectReference: {fileID: 6652863603296756405}
+    - target: {fileID: 2182321055254443742, guid: bab680a9e6239f7469c10b63df86d291, type: 3}
+      propertyPath: _additionalLightEnableTargets.Array.data[7]
+      value: 
+      objectReference: {fileID: 8717574990302948351}
+    - target: {fileID: 2182321055254443742, guid: bab680a9e6239f7469c10b63df86d291, type: 3}
+      propertyPath: _additionalLightEnableTargets.Array.data[8]
+      value: 
+      objectReference: {fileID: 810170552861159544}
+    - target: {fileID: 2182321055254443742, guid: bab680a9e6239f7469c10b63df86d291, type: 3}
+      propertyPath: _additionalLightEnableTargets.Array.data[9]
+      value: 
+      objectReference: {fileID: 8052855157737000666}
     - target: {fileID: 4956920378298177902, guid: bab680a9e6239f7469c10b63df86d291, type: 3}
       propertyPath: SortKey
       value: 4019095525
@@ -19403,11 +19449,51 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9a3b53b8d8640fa44a5d3e60b7b038fa, type: 3}
+--- !u!108 &360064592309782731 stripped
+Light:
+  m_CorrespondingSourceObject: {fileID: 5011031874544541516, guid: 9a3b53b8d8640fa44a5d3e60b7b038fa, type: 3}
+  m_PrefabInstance: {fileID: 4716946829700306823}
+  m_PrefabAsset: {fileID: 0}
+--- !u!108 &1941197670452631161 stripped
+Light:
+  m_CorrespondingSourceObject: {fileID: 6594803507341296126, guid: 9a3b53b8d8640fa44a5d3e60b7b038fa, type: 3}
+  m_PrefabInstance: {fileID: 4716946829700306823}
+  m_PrefabAsset: {fileID: 0}
+--- !u!108 &4832004871745595133 stripped
+Light:
+  m_CorrespondingSourceObject: {fileID: 178821212979032442, guid: 9a3b53b8d8640fa44a5d3e60b7b038fa, type: 3}
+  m_PrefabInstance: {fileID: 4716946829700306823}
+  m_PrefabAsset: {fileID: 0}
+--- !u!108 &5846139990651323165 stripped
+Light:
+  m_CorrespondingSourceObject: {fileID: 1176670399992911002, guid: 9a3b53b8d8640fa44a5d3e60b7b038fa, type: 3}
+  m_PrefabInstance: {fileID: 4716946829700306823}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &6644083776084637338 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2108090175275196701, guid: 9a3b53b8d8640fa44a5d3e60b7b038fa, type: 3}
   m_PrefabInstance: {fileID: 4716946829700306823}
   m_PrefabAsset: {fileID: 0}
+--- !u!108 &6652863603296756405 stripped
+Light:
+  m_CorrespondingSourceObject: {fileID: 2100452126522209586, guid: 9a3b53b8d8640fa44a5d3e60b7b038fa, type: 3}
+  m_PrefabInstance: {fileID: 4716946829700306823}
+  m_PrefabAsset: {fileID: 0}
+--- !u!108 &6755838309109644512 stripped
+Light:
+  m_CorrespondingSourceObject: {fileID: 2068411185325517671, guid: 9a3b53b8d8640fa44a5d3e60b7b038fa, type: 3}
+  m_PrefabInstance: {fileID: 4716946829700306823}
+  m_PrefabAsset: {fileID: 0}
+--- !u!108 &7075559330935866365 stripped
+Light:
+  m_CorrespondingSourceObject: {fileID: 2541324999182193786, guid: 9a3b53b8d8640fa44a5d3e60b7b038fa, type: 3}
+  m_PrefabInstance: {fileID: 4716946829700306823}
+  m_PrefabAsset: {fileID: 0}
+--- !u!108 &8717574990302948351 stripped
+Light:
+  m_CorrespondingSourceObject: {fileID: 4147527607403363448, guid: 9a3b53b8d8640fa44a5d3e60b7b038fa, type: 3}
+  m_PrefabInstance: {fileID: 4716946829700306823}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4721787756986374654
 PrefabInstance:
   m_ObjectHideFlags: 0

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_CargoControlRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_CargoControlRoom.prefab
@@ -209,7 +209,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 17
-  _IsErosion:
+  _lightEnableTargetSectors: 11000000100000000300000004000000050000000f000000
+  _IsEroded:
     _value: 0
 --- !u!114 &-3778320720504054751
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_ContainmentControlRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_ContainmentControlRoom.prefab
@@ -51,7 +51,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 13
-  _IsErosion:
+  _lightEnableTargetSectors: 0d0000000c0000000e000000020000000300000009000000
+  _IsEroded:
     _value: 0
 --- !u!114 &2759876229927772231
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_ContainmentRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_ContainmentRoom.prefab
@@ -126,7 +126,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 12
-  _IsErosion:
+  _lightEnableTargetSectors: 0c00000001000000020000000e0000000d00000003000000
+  _IsEroded:
     _value: 0
 --- !u!114 &-5253184296135782574
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_A.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_A.prefab
@@ -119,7 +119,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 1
-  _IsErosion:
+  _lightEnableTargetSectors: 010000000c0000000b00000006000000020000000e0000000d0000000300000004000000
+  _IsEroded:
     _value: 0
 --- !u!114 &1938526588529392681
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_B.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_B.prefab
@@ -167,7 +167,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 2
-  _IsErosion:
+  _lightEnableTargetSectors: 02000000010000000c0000000d0000000e0000000900000003000000040000000b000000060000001000000005000000
+  _IsEroded:
     _value: 0
 --- !u!114 &-1894697666103748573
 MonoBehaviour:
@@ -183,7 +184,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   SortKey: 4258888511
   ObjectInterest: 1
-  Flags: 1
+  Flags: 262145
   NestedObjects: []
   NetworkedBehaviours:
   - {fileID: -9139450609498887725}

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_C.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_C.prefab
@@ -27,7 +27,7 @@ Transform:
   m_GameObject: {fileID: 618107262263906786}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
-  m_LocalPosition: {x: 9.093, y: 3.131, z: 0.042999268}
+  m_LocalPosition: {x: 9.093, y: 2.62, z: 0.042999268}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -45,7 +45,7 @@ Light:
   m_Type: 2
   m_Shape: 0
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Intensity: 1.9894367
+  m_Intensity: 3.9788735
   m_Range: 5
   m_SpotAngle: 30
   m_InnerSpotAngle: 21.80208
@@ -107,7 +107,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Intensity: 25
+  m_Intensity: 50
   m_EnableSpotReflector: 1
   m_LuxAtDistance: 1
   m_InnerSpotPercent: 0
@@ -270,7 +270,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 3
-  _IsErosion:
+  _lightEnableTargetSectors: 0300000002000000010000000c0000000d0000000f000000110000000500000010000000
+  _additionalLightEnableTargets: []
+  _IsEroded:
     _value: 0
 --- !u!114 &687740235021026586
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_D.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_D.prefab
@@ -694,7 +694,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 4
-  _IsErosion:
+  _lightEnableTargetSectors: 0400000002000000050000000b000000060000001000000011000000
+  _IsEroded:
     _value: 0
 --- !u!114 &8035556663697573054
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_E.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Corridor_E.prefab
@@ -51,7 +51,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 5
-  _IsErosion:
+  _lightEnableTargetSectors: 050000000200000003000000040000000f0000000c0000000a00000011000000
+  _IsEroded:
     _value: 0
 --- !u!114 &4994949059107801658
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_ObservationRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_ObservationRoom.prefab
@@ -153,7 +153,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 14
-  _IsErosion:
+  _lightEnableTargetSectors: 0e0000000c0000000d00000002000000
+  _IsEroded:
     _value: 0
 --- !u!114 &5427918281792913256
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_PowerRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_PowerRoom.prefab
@@ -431,7 +431,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 16
-  _IsErosion:
+  _lightEnableTargetSectors: 10000000110000000400000002000000080000000900000018000000
+  _additionalLightEnableTargets: []
+  _IsEroded:
     _value: 0
 --- !u!114 &2893460777500426099
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_SampleRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_SampleRoom.prefab
@@ -530,7 +530,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 15
-  _IsErosion:
+  _lightEnableTargetSectors: 0f000000050000000300000011000000
+  _IsEroded:
     _value: 0
 --- !u!114 &1145023235402561685
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/1F_Storage.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/1F_Storage.prefab
@@ -50,7 +50,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 11
-  _IsErosion:
+  _lightEnableTargetSectors: 0100000002000000040000000b000000060000000c000000
+  _IsEroded:
     _value: 0
 --- !u!114 &-6795670767459832389
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Cafeteria.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Cafeteria.prefab
@@ -174,7 +174,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 21
-  _IsErosion:
+  _lightEnableTargetSectors: 1500000007000000090000000a000000020000001600000018000000
+  _IsEroded:
     _value: 0
 --- !u!114 &-763962206979445043
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_CentralControlRoom.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_CentralControlRoom.prefab
@@ -249,7 +249,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 18
-  _IsErosion:
+  _lightEnableTargetSectors: 06000000070000001400000012000000
+  _IsEroded:
     _value: 0
 --- !u!114 &-9196128011080814552
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_A.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_A.prefab
@@ -569,7 +569,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 6
-  _IsErosion:
+  _lightEnableTargetSectors: 060000000b0000000700000008000000120000001300000009000000
+  _IsEroded:
     _value: 0
 --- !u!114 &1737461934078090274
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_B.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_B.prefab
@@ -556,7 +556,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 7
-  _IsErosion:
+  _lightEnableTargetSectors: 0700000006000000120000000900000015000000
+  _IsEroded:
     _value: 0
 --- !u!114 &-7971593262542106541
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_C.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_C.prefab
@@ -88,7 +88,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 8
-  _IsErosion:
+  _lightEnableTargetSectors: 06000000080000001300000014000000090000001000000018000000
+  _IsEroded:
     _value: 0
 --- !u!114 &1291406864182309686
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_D.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_D.prefab
@@ -722,7 +722,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 9
-  _IsErosion:
+  _lightEnableTargetSectors: 0900000008000000070000000a0000001800000015000000020000000e0000000c000000
+  _IsEroded:
     _value: 0
 --- !u!114 &-6161325759060205551
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_E.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_E.prefab
@@ -833,7 +833,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 10
-  _IsErosion:
+  _lightEnableTargetSectors: 0a0000000900000017000000180000001600000015000000
+  _additionalLightEnableTargets:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  _IsEroded:
     _value: 0
 --- !u!114 &4956920378298177902
 MonoBehaviour:
@@ -849,7 +861,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   SortKey: 3236714009
   ObjectInterest: 1
-  Flags: 1
+  Flags: 262145
   NestedObjects:
   - {fileID: 551078138973240915}
   NetworkedBehaviours:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_DiningFacility.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_DiningFacility.prefab
@@ -249,7 +249,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 24
-  _IsErosion:
+  _lightEnableTargetSectors: 180000000a00000009000000170000000800000015000000
+  _IsEroded:
     _value: 0
 --- !u!114 &-4515694652883106185
 MonoBehaviour:

diff --git a/Client/Assets/Resources/Prefabs/Map/Sector/2F_DirectorOffice.prefab b/Client/Assets/Resources/Prefabs/Map/Sector/2F_DirectorOffice.prefab
@@ -152,7 +152,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _sectorName: 23
-  _IsErosion:
+  _lightEnableTargetSectors: 170000000a0000001800000009000000
+  _IsEroded:
     _value: 0
 --- !u!114 &-1179783766410140560
 MonoBehaviour: