diff --git a/Catalysis/Assets/Materials/Skybox/Skybox_bad.mat b/Catalysis/Assets/Materials/Skybox/Skybox_bad.mat
index d849d15877f5a49f44724ec3eb5b732e17f19aac..15879662c69c720e8057f8ed0dbfa212e6c8149f 100644
--- a/Catalysis/Assets/Materials/Skybox/Skybox_bad.mat
+++ b/Catalysis/Assets/Materials/Skybox/Skybox_bad.mat
@@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Skybox_bad - Copy
+ m_Name: Skybox_bad
m_Shader: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _SUNDISK_HIGH_QUALITY
m_LightmapFlags: 4
diff --git a/Catalysis/Assets/Materials/Skybox/Skybox_current.mat b/Catalysis/Assets/Materials/Skybox/Skybox_current.mat
index 4ebb98a376304fe73fd6db16c8854a8b05b16318..367a0486a3e8a9a693626f153f4bef70ff3691f9 100644
--- a/Catalysis/Assets/Materials/Skybox/Skybox_current.mat
+++ b/Catalysis/Assets/Materials/Skybox/Skybox_current.mat
@@ -56,7 +56,7 @@ Material:
- _Cutoff: 0.5
- _DstBlend: 0
- _EnvironmentReflections: 1
- - _Exposure: 1
+ - _Exposure: 1.6989157
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
@@ -70,7 +70,7 @@ Material:
- _SrcBlend: 1
- _SunDisk: 2
- _SunSize: 0.04
- - _SunSizeConvergence: 5
+ - _SunSizeConvergence: 3.90173
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
diff --git a/Catalysis/Assets/Materials/Skybox/Skybox_good.mat b/Catalysis/Assets/Materials/Skybox/Skybox_good.mat
index 756548b97debad51676e2c99309fd4d40cabce40..759283fe6ffc750552f5ca55f55dd28432ecf172 100644
--- a/Catalysis/Assets/Materials/Skybox/Skybox_good.mat
+++ b/Catalysis/Assets/Materials/Skybox/Skybox_good.mat
@@ -56,7 +56,7 @@ Material:
- _Cutoff: 0.5
- _DstBlend: 0
- _EnvironmentReflections: 1
- - _Exposure: 1.5
+ - _Exposure: 1.7
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
@@ -70,7 +70,7 @@ Material:
- _SrcBlend: 1
- _SunDisk: 2
- _SunSize: 0.04
- - _SunSizeConvergence: 3.72
+ - _SunSizeConvergence: 3.9
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
diff --git a/Catalysis/Assets/Scenes/Baked Light.prefab b/Catalysis/Assets/Scenes/Baked Light.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..f1adacba24c91c699125c2719d3915e4e135dc6b
--- /dev/null
+++ b/Catalysis/Assets/Scenes/Baked Light.prefab
@@ -0,0 +1,94 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1769646819524478198
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2198216970783009564}
+ - component: {fileID: 7127227263526255697}
+ m_Layer: 0
+ m_Name: Baked Light
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2198216970783009564
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1769646819524478198}
+ m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+ m_LocalPosition: {x: 1.0755013, y: 26.176682, z: 0.40757236}
+ m_LocalScale: {x: 0.1, y: 0.23534201, z: 0.16804327}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!108 &7127227263526255697
+Light:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1769646819524478198}
+ m_Enabled: 1
+ serializedVersion: 10
+ m_Type: 1
+ m_Shape: 0
+ m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+ m_Intensity: 0.5
+ m_Range: 10
+ m_SpotAngle: 30
+ m_InnerSpotAngle: 21.80208
+ m_CookieSize: 10
+ m_Shadows:
+ m_Type: 0
+ m_Resolution: -1
+ m_CustomResolution: -1
+ m_Strength: 1
+ m_Bias: 0.05
+ m_NormalBias: 0.4
+ m_NearPlane: 0.2
+ m_CullingMatrixOverride:
+ e00: 1
+ e01: 0
+ e02: 0
+ e03: 0
+ e10: 0
+ e11: 1
+ e12: 0
+ e13: 0
+ e20: 0
+ e21: 0
+ e22: 1
+ e23: 0
+ e30: 0
+ e31: 0
+ e32: 0
+ e33: 1
+ m_UseCullingMatrixOverride: 0
+ m_Cookie: {fileID: 0}
+ m_DrawHalo: 0
+ m_Flare: {fileID: 0}
+ m_RenderMode: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingLayerMask: 1
+ m_Lightmapping: 2
+ m_LightShadowCasterMode: 0
+ m_AreaSize: {x: 1, y: 1}
+ m_BounceIntensity: 1
+ m_ColorTemperature: 6570
+ m_UseColorTemperature: 0
+ m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+ m_UseBoundingSphereOverride: 0
+ m_ShadowRadius: 0
+ m_ShadowAngle: 0
diff --git a/Catalysis/Assets/Scenes/Baked Light.prefab.meta b/Catalysis/Assets/Scenes/Baked Light.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..8675d5145b0d5fb23661f28c829f0b99bc00180b
--- /dev/null
+++ b/Catalysis/Assets/Scenes/Baked Light.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 09e41b10bdad2aa4b80d7f1b67b9e977
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Catalysis/Assets/Scenes/MainScene.unity b/Catalysis/Assets/Scenes/MainScene.unity
index ea9b37839fd2964f516b38ce292ba454f64667da..bc6fe358b35345cb96138215f94b2c50853efd20 100644
--- a/Catalysis/Assets/Scenes/MainScene.unity
+++ b/Catalysis/Assets/Scenes/MainScene.unity
@@ -923,6 +923,100 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 7918159519554275796}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &298279464
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 298279468}
+ - component: {fileID: 298279467}
+ - component: {fileID: 298279466}
+ - component: {fileID: 298279465}
+ m_Layer: 0
+ m_Name: 8.4 moh
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!64 &298279465
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 298279464}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 4
+ m_Convex: 0
+ m_CookingOptions: 30
+ m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &298279466
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 298279464}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!33 &298279467
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 298279464}
+ m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &298279468
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 298279464}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -63.2577, y: -50.77, z: 27.612585}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &324503978
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2812,6 +2906,100 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1794964215}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &843883167
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 843883171}
+ - component: {fileID: 843883170}
+ - component: {fileID: 843883169}
+ - component: {fileID: 843883168}
+ m_Layer: 0
+ m_Name: 8.4 moh (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!64 &843883168
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 843883167}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 4
+ m_Convex: 0
+ m_CookingOptions: 30
+ m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &843883169
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 843883167}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!33 &843883170
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 843883167}
+ m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &843883171
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 843883167}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -119.4, y: -59.17, z: 27.612585}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 8
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &862456378 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7307283207174026045, guid: 058cab9d49b9d544085318dadbf05400,
@@ -3179,10 +3367,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7bcd57ac7ffc14b439cda759f497ef0c, type: 3}
m_Name:
m_EditorClassIdentifier:
- currentSkyBox: {fileID: 2100000, guid: 1e33c16c204bfcf48ba1c8788019ac4d, type: 2}
- normalSkyBox: {fileID: 2100000, guid: d8a9851220aa57548949ad3310f63595, type: 2}
goodSkyBox: {fileID: 2100000, guid: 8f6c9e6ab8d45fa468932d88805fdd79, type: 2}
badSkyBox: {fileID: 2100000, guid: 4fc8ec2b415f2834899830a6470c0154, type: 2}
+ normalSkyBox: {fileID: 2100000, guid: d8a9851220aa57548949ad3310f63595, type: 2}
+ currentSkyBox: {fileID: 2100000, guid: 1e33c16c204bfcf48ba1c8788019ac4d, type: 2}
+ sun: {fileID: 5882156889427171613}
+ maxSunStrength: 1
+ normalSunStrength: 0.8
+ minSunStrength: 0.5
--- !u!114 &1004561569 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7523515305514710623, guid: a1fcf738817628b449abd0ae5e82e2bb,
@@ -7694,6 +7886,75 @@ Transform:
m_Father: {fileID: 3301792471449033292}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &487006909606947319
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 5882156890280360770}
+ m_Modifications:
+ - target: {fileID: 1769646819524478198, guid: 09e41b10bdad2aa4b80d7f1b67b9e977,
+ type: 3}
+ propertyPath: m_Name
+ value: Baked Light
+ objectReference: {fileID: 0}
+ - target: {fileID: 2198216970783009564, guid: 09e41b10bdad2aa4b80d7f1b67b9e977,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2198216970783009564, guid: 09e41b10bdad2aa4b80d7f1b67b9e977,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 1.0755013
+ objectReference: {fileID: 0}
+ - target: {fileID: 2198216970783009564, guid: 09e41b10bdad2aa4b80d7f1b67b9e977,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 26.176682
+ objectReference: {fileID: 0}
+ - target: {fileID: 2198216970783009564, guid: 09e41b10bdad2aa4b80d7f1b67b9e977,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0.40757236
+ objectReference: {fileID: 0}
+ - target: {fileID: 2198216970783009564, guid: 09e41b10bdad2aa4b80d7f1b67b9e977,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 2198216970783009564, guid: 09e41b10bdad2aa4b80d7f1b67b9e977,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 2198216970783009564, guid: 09e41b10bdad2aa4b80d7f1b67b9e977,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2198216970783009564, guid: 09e41b10bdad2aa4b80d7f1b67b9e977,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2198216970783009564, guid: 09e41b10bdad2aa4b80d7f1b67b9e977,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 90
+ objectReference: {fileID: 0}
+ - target: {fileID: 2198216970783009564, guid: 09e41b10bdad2aa4b80d7f1b67b9e977,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2198216970783009564, guid: 09e41b10bdad2aa4b80d7f1b67b9e977,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 09e41b10bdad2aa4b80d7f1b67b9e977, type: 3}
--- !u!1001 &563630222964815999
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8100,20 +8361,12 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6489905960628295295}
m_Mesh: {fileID: 6939945818436453696, guid: 5c0a9231deb3cf84fa0b0ab9d0e70114, type: 3}
---- !u!4 &1748399977103213291
+--- !u!4 &1748399977103213291 stripped
Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 2198216970783009564, guid: 09e41b10bdad2aa4b80d7f1b67b9e977,
+ type: 3}
+ m_PrefabInstance: {fileID: 487006909606947319}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2183469960240590081}
- m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
- m_LocalPosition: {x: 1.0755013, y: 26.176682, z: 0.40757236}
- m_LocalScale: {x: 0.1, y: 0.23534201, z: 0.16804327}
- m_Children: []
- m_Father: {fileID: 5882156890280360770}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!4 &1851834320447087216
Transform:
m_ObjectHideFlags: 0
@@ -8687,23 +8940,6 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
---- !u!1 &2183469960240590081
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1748399977103213291}
- - component: {fileID: 7217807143569610150}
- m_Layer: 0
- m_Name: Baked Light
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!1 &2329163277031701058
GameObject:
m_ObjectHideFlags: 0
@@ -12204,7 +12440,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5882156890898402874}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: -12.4, z: 0}
+ m_LocalPosition: {x: 0, y: -11.07, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5882156890029258929}
@@ -20167,67 +20403,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5258083755297039266}
m_Mesh: {fileID: 3564490162841938596, guid: 5c0a9231deb3cf84fa0b0ab9d0e70114, type: 3}
---- !u!108 &7217807143569610150
-Light:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2183469960240590081}
- m_Enabled: 1
- serializedVersion: 10
- m_Type: 1
- m_Shape: 0
- m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
- m_Intensity: 0.5
- m_Range: 10
- m_SpotAngle: 30
- m_InnerSpotAngle: 21.80208
- m_CookieSize: 10
- m_Shadows:
- m_Type: 0
- m_Resolution: -1
- m_CustomResolution: -1
- m_Strength: 1
- m_Bias: 0.05
- m_NormalBias: 0.4
- m_NearPlane: 0.2
- m_CullingMatrixOverride:
- e00: 1
- e01: 0
- e02: 0
- e03: 0
- e10: 0
- e11: 1
- e12: 0
- e13: 0
- e20: 0
- e21: 0
- e22: 1
- e23: 0
- e30: 0
- e31: 0
- e32: 0
- e33: 1
- m_UseCullingMatrixOverride: 0
- m_Cookie: {fileID: 0}
- m_DrawHalo: 0
- m_Flare: {fileID: 0}
- m_RenderMode: 0
- m_CullingMask:
- serializedVersion: 2
- m_Bits: 4294967295
- m_RenderingLayerMask: 1
- m_Lightmapping: 2
- m_LightShadowCasterMode: 0
- m_AreaSize: {x: 1, y: 1}
- m_BounceIntensity: 1
- m_ColorTemperature: 6570
- m_UseColorTemperature: 0
- m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
- m_UseBoundingSphereOverride: 0
- m_ShadowRadius: 0
- m_ShadowAngle: 0
--- !u!1 &7405736514965150371
GameObject:
m_ObjectHideFlags: 0
diff --git a/Catalysis/Assets/Scripts/SkyBoxManager.cs b/Catalysis/Assets/Scripts/SkyBoxManager.cs
index c5d1e7317730982ebbf31e92b9f9f608fe4b4008..c6963f2d207ce16eb12e797c192bece0550e4b9a 100644
--- a/Catalysis/Assets/Scripts/SkyBoxManager.cs
+++ b/Catalysis/Assets/Scripts/SkyBoxManager.cs
@@ -5,9 +5,9 @@ using UnityEngine;
public class SkyBoxManager : MonoBehaviour
{
- public Material currentSkyBox, normalSkyBox, goodSkyBox, badSkyBox;
- private float goodConv, badConv, normalConv, currentConv;
- private float goodExpo, badExpo, normalExpo, currentExpo;
+ public Material goodSkyBox, badSkyBox, normalSkyBox, currentSkyBox;
+ private float goodConv, badConv, normalConv;
+ private float goodExpo, badExpo, normalExpo;
private ScenarioManager scenarioManager;
private CarbonController carbonController;
public GameObject sun;
@@ -25,13 +25,11 @@ public class SkyBoxManager : MonoBehaviour
goodConv = goodSkyBox.GetFloat("_SunSizeConvergence");
badConv = badSkyBox.GetFloat("_SunSizeConvergence");
normalConv = normalSkyBox.GetFloat("_SunSizeConvergence");
- currentConv = currentSkyBox.GetFloat("_SunSizeConvergence");
//exposure
goodExpo = goodSkyBox.GetFloat("_Exposure");
badExpo = badSkyBox.GetFloat("_Exposure");
normalExpo = normalSkyBox.GetFloat("_Exposure");
- currentExpo = currentSkyBox.GetFloat("_Exposure");
// Set starting skybox
@@ -47,8 +45,8 @@ public class SkyBoxManager : MonoBehaviour
void ResetSkybox()
{
- float convChange = normalConv - currentConv;
- float expoChange = normalExpo - currentExpo;
+ float convChange = normalConv - currentSkyBox.GetFloat("_SunSizeConvergence");
+ float expoChange = normalExpo - currentSkyBox.GetFloat("_Exposure");
float sunlightChange = normalSunStrength - sunLight.intensity;
StartCoroutine(FadeSkybox(scenarioManager.transitionDuration, convChange, expoChange, sunlightChange));
@@ -62,15 +60,15 @@ public class SkyBoxManager : MonoBehaviour
if (percentCarbonRemaining > .60f)
{
- convChange = (badConv - currentConv) * (percentCarbonRemaining - 0.60f) * 2.50f;
- expoChange = (badExpo - currentExpo) * (percentCarbonRemaining - 0.60f) * 2.50f;
+ convChange = (badConv - currentSkyBox.GetFloat("_SunSizeConvergence")) * (percentCarbonRemaining - 0.60f) * 2.50f;
+ expoChange = (badExpo - currentSkyBox.GetFloat("_Exposure")) * (percentCarbonRemaining - 0.60f) * 2.50f;
sunlightChange = (minSunStrength - normalSunStrength) * (percentCarbonRemaining - 0.60f) * 2.50f;
}
else if (percentCarbonRemaining < .40f)
{
- convChange = (goodConv - currentConv) * (1 - (percentCarbonRemaining * 2.50f));
- expoChange = (goodExpo - currentExpo) * (1 - (percentCarbonRemaining * 2.50f));
+ convChange = (goodConv - currentSkyBox.GetFloat("_SunSizeConvergence")) * (1 - (percentCarbonRemaining * 2.50f));
+ expoChange = (goodExpo - currentSkyBox.GetFloat("_Exposure")) * (1 - (percentCarbonRemaining * 2.50f));
sunlightChange = (maxSunStrength - normalSunStrength) * (1 - (percentCarbonRemaining * 2.50f));
@@ -86,8 +84,8 @@ public class SkyBoxManager : MonoBehaviour
{
float updatesPerSecond = 0.01f;
- float convPrevious = currentConv;
- float expoPrevious = currentExpo;
+ float convPrevious = currentSkyBox.GetFloat("_SunSizeConvergence");
+ float expoPrevious = currentSkyBox.GetFloat("_Exposure");
float sunPrevious = sunLight.intensity;
@@ -101,10 +99,6 @@ public class SkyBoxManager : MonoBehaviour
yield return new WaitForSeconds(updatesPerSecond);
}
-
- currentConv = currentSkyBox.GetFloat("_SunSizeConvergence");
- currentExpo = currentSkyBox.GetFloat("_Exposure");
-
}