diff --git a/.gitignore b/.gitignore index 7c44666..39ef604 100644 --- a/.gitignore +++ b/.gitignore @@ -94,12 +94,3 @@ InitTestScene*.unity # Local development scenes / assets /[Aa]ssets/[Dd]eveloper/ /[Aa]ssets/[Dd]eveloper.meta - -# Lightmaps are too big to always commit -# Manually include textures later, e.g. !/Assets/Textures/*.png -*.exr* -*.png* -LightingData.asset* - -# Undo the above change for Graphics -!/[Aa]ssets/[Gg]raphics/**/* diff --git a/Assets/GameObjects/Scenes/TestScene.unity b/Assets/GameObjects/Scenes/TestScene.unity index 4ed141a..0017156 100644 --- a/Assets/GameObjects/Scenes/TestScene.unity +++ b/Assets/GameObjects/Scenes/TestScene.unity @@ -180,13 +180,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 130756071} - m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} - m_LocalPosition: {x: -26.75, y: 10, z: -0.25} + m_LocalRotation: {x: 0.76604444, y: 0, z: 0, w: 0.64278764} + m_LocalPosition: {x: -22, y: 9.75, z: 12.25} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} m_RootOrder: 14 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 100, y: 0, z: 0} --- !u!108 &130756073 Light: m_ObjectHideFlags: 0 @@ -240,11 +240,11 @@ Light: m_RenderingLayerMask: 1 m_Lightmapping: 2 m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1.7299728, y: 11.910152} + m_AreaSize: {x: 1.7299728, y: 5.910183} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: NaN, y: 1.0896e-41, z: NaN, w: 0} + m_BoundingSphereOverride: {x: 1.36e-43, y: 2.06e-43, z: 0, w: 8.770593e+9} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -338,7 +338,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} propertyPath: m_ScaleInLightmap - value: 0.3 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} propertyPath: m_DynamicOccludee @@ -352,6 +352,10 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 4294967295 objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} --- !u!4 &315509112 stripped @@ -359,25 +363,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} m_PrefabInstance: {fileID: 315509111} m_PrefabAsset: {fileID: 0} ---- !u!1 &315509113 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} - m_PrefabInstance: {fileID: 315509111} - m_PrefabAsset: {fileID: 0} ---- !u!64 &315509114 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 315509113} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -5495902117074765545, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} --- !u!1 &332119780 GameObject: m_ObjectHideFlags: 0 @@ -638,7 +623,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 551935398} m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} - m_LocalPosition: {x: -13.25, y: 10.5, z: -5} + m_LocalPosition: {x: -11.25, y: 10.25, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -701,7 +686,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_BoundingSphereOverride: {x: 0, y: 2.3508e-41, z: 0, w: 1.2884902e+11} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -730,7 +715,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 583983921} m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} - m_LocalPosition: {x: 0, y: 5, z: 0} + m_LocalPosition: {x: 0, y: 4.75, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -793,7 +778,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 4.1543445e+34, w: 0} + m_BoundingSphereOverride: {x: 0, y: 1.2903e-41, z: 0, w: 3.5165045e+10} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -897,7 +882,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 656646606} m_LocalRotation: {x: 0.5609856, y: -0.43045974, z: 0.56098396, w: 0.43046096} - m_LocalPosition: {x: -31.25, y: 7.5, z: 15.75} + m_LocalPosition: {x: -31.25, y: 7.25, z: 15.75} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -960,7 +945,99 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: -1.10477574e+11, z: 1.36e-43, w: 8.0356e-41} + m_BoundingSphereOverride: {x: 0, y: 2.6675e-41, z: 0, w: 1.5784005e+11} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!1 &665920419 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 665920420} + - component: {fileID: 665920421} + m_Layer: 0 + m_Name: Area Light_19 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &665920420 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665920419} + m_LocalRotation: {x: 0.6456306, y: -0, z: -0, w: 0.7636499} + m_LocalPosition: {x: -22, y: 9.75, z: -12.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2052767392} + m_RootOrder: 19 + m_LocalEulerAnglesHint: {x: 80.426, y: 0, z: 0} +--- !u!108 &665920421 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665920419} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 3 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + 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.7299728, y: 5.910183} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 1.36e-43, y: 2.06e-43, z: 0, w: 8.770593e+9} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -989,7 +1066,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 678608090} m_LocalRotation: {x: 0.79335225, y: -0, z: -0, w: 0.60876286} - m_LocalPosition: {x: -38, y: 5.5, z: -11} + m_LocalPosition: {x: -38, y: 5.25, z: -11} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -1052,7 +1129,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 4e-45} + m_BoundingSphereOverride: {x: 0, y: 2.3441e-41, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -1081,7 +1158,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 710357828} m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} - m_LocalPosition: {x: -28, y: 4.5, z: -6.25} + m_LocalPosition: {x: -28, y: 4.25, z: -6.25} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -1144,7 +1221,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 7.7e-44, y: 0, z: 0, w: 1.806e-41} + m_BoundingSphereOverride: {x: 0, y: 1.75e-41, z: 0, w: 2.4024973e+10} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -1228,7 +1305,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 867895615} m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} - m_LocalPosition: {x: -28, y: 4.5, z: 6} + m_LocalPosition: {x: -28, y: 4.25, z: 6} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -1291,7 +1368,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 2.3509887e-38, z: 4.1543445e+34, w: 0} + m_BoundingSphereOverride: {x: 0, y: 2.3452e-41, z: 0, w: 1.6750372e+11} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -1363,7 +1440,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 892420337} m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} - m_LocalPosition: {x: -22, y: 4.5, z: -14} + m_LocalPosition: {x: -22, y: 4.25, z: -14} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -1426,7 +1503,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_BoundingSphereOverride: {x: 1.36e-43, y: 4.08e-43, z: 0, w: 1.6851206e+11} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -1559,7 +1636,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1201793133} m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} - m_LocalPosition: {x: -14, y: 4.5, z: 0} + m_LocalPosition: {x: -14, y: 4.25, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -1622,7 +1699,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 2.3509887e-38, z: 4.1543445e+34, w: 0} + m_BoundingSphereOverride: {x: 1.36e-43, y: 4.08e-43, z: 0, w: 1.5792642e+11} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -1694,7 +1771,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1263920417} m_LocalRotation: {x: 0.5609856, y: -0.43045974, z: 0.56098396, w: 0.43046096} - m_LocalPosition: {x: -31.25, y: 7.5, z: -16} + m_LocalPosition: {x: -31.25, y: 7.25, z: -16} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -1757,7 +1834,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_BoundingSphereOverride: {x: 0, y: 2.3491e-41, z: 0, w: 1.5784005e+11} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -1816,7 +1893,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1326636135} m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} - m_LocalPosition: {x: -46, y: 4.5, z: 5.5} + m_LocalPosition: {x: -46, y: 4.25, z: 5.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -1879,7 +1956,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 2.3509887e-38, z: 4.1543445e+34, w: 0} + m_BoundingSphereOverride: {x: 0, y: 2.6305e-41, z: 0, w: 4.670777e+10} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -1940,7 +2017,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544796994} m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} - m_LocalPosition: {x: -46, y: 4.5, z: -5.5} + m_LocalPosition: {x: -46, y: 4.25, z: -5.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -2003,7 +2080,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 3.59e-43, z: 0, w: 0} + m_BoundingSphereOverride: {x: 0, y: 2.3458e-41, z: 0, w: 1.6750372e+11} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -2133,7 +2210,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1741427398} m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} - m_LocalPosition: {x: -13.25, y: 10.5, z: 5} + m_LocalPosition: {x: -11.25, y: 10.25, z: 5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -2196,7 +2273,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 2.3509887e-38, z: 4.1543445e+34, w: 0} + m_BoundingSphereOverride: {x: 1.36e-43, y: 4.08e-43, z: 0, w: 2.8737454e+10} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -2320,7 +2397,7 @@ MeshRenderer: m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 + m_ScaleInLightmap: 0.4 m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 @@ -2415,7 +2492,7 @@ MeshRenderer: m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 + m_ScaleInLightmap: 0.4 m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 @@ -2463,7 +2540,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1927936035} m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} - m_LocalPosition: {x: -11.25, y: 4.5, z: 18} + m_LocalPosition: {x: -11.25, y: 4.25, z: 18} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -2526,7 +2603,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_BoundingSphereOverride: {x: 0, y: 2.6378e-41, z: 0, w: 1.1542725e+10} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -2598,7 +2675,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1949389723} m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} - m_LocalPosition: {x: -22, y: 4.5, z: 14} + m_LocalPosition: {x: -22, y: 4.25, z: 14} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -2661,7 +2738,99 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 1.0123e-41, z: 0, w: 0} + m_BoundingSphereOverride: {x: 0, y: 2.3486e-41, z: 0, w: 1.5784005e+11} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!1 &2012327804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2012327805} + - component: {fileID: 2012327806} + m_Layer: 0 + m_Name: Area Light_18 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2012327805 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2012327804} + m_LocalRotation: {x: 0.49999997, y: 0.50000006, z: -0.4999985, w: 0.50000155} + m_LocalPosition: {x: -35, y: 4.25, z: 3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2052767392} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: -90} +--- !u!108 &2012327806 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2012327804} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 3 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + 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.7299728, y: 5.9102745} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 2.3676e-41, z: 0, w: 3.422552e+10} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -2690,7 +2859,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2030709493} m_LocalRotation: {x: 0.6087605, y: -0, z: -0, w: 0.79335415} - m_LocalPosition: {x: -38, y: 5.5, z: 11} + m_LocalPosition: {x: -38, y: 5.25, z: 11} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -2753,7 +2922,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1e-45} + m_BoundingSphereOverride: {x: 0, y: 1.1821e-41, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -2782,7 +2951,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2038603409} m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} - m_LocalPosition: {x: -11.25, y: 4.5, z: -18} + m_LocalPosition: {x: -11.25, y: 4.25, z: -18} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} @@ -2845,7 +3014,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 1.2427e-41, z: 0, w: 0} + m_BoundingSphereOverride: {x: 0, y: 2.3469e-41, z: 0, w: 1.6750372e+11} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -2873,7 +3042,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2052767391} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.822436, y: -2.032894, z: 3.4411402} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 583983922} @@ -2894,6 +3063,8 @@ Transform: - {fileID: 551935399} - {fileID: 1741427399} - {fileID: 1949389724} + - {fileID: 2012327805} + - {fileID: 665920420} m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2921,13 +3092,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2084062065} - m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} - m_LocalPosition: {x: -33, y: 4.5, z: -0.25} + m_LocalRotation: {x: 0.49999997, y: 0.50000006, z: -0.4999985, w: 0.50000155} + m_LocalPosition: {x: -35, y: 4.25, z: -3} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2052767392} m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: -90} --- !u!108 &2084062067 Light: m_ObjectHideFlags: 0 @@ -2985,7 +3156,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1e-45} + m_BoundingSphereOverride: {x: 0, y: 2.3676e-41, z: 0, w: 3.422552e+10} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 diff --git a/Assets/GameObjects/Scenes/TestScene/LightingData.asset b/Assets/GameObjects/Scenes/TestScene/LightingData.asset new file mode 100644 index 0000000..5b497c9 Binary files /dev/null and b/Assets/GameObjects/Scenes/TestScene/LightingData.asset differ diff --git a/Assets/GameObjects/Scenes/TestScene/LightingData.asset.meta b/Assets/GameObjects/Scenes/TestScene/LightingData.asset.meta new file mode 100644 index 0000000..4cb4711 --- /dev/null +++ b/Assets/GameObjects/Scenes/TestScene/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 598a4fae95edbca4f81df6d5b3bd0688 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_dir.png b/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_dir.png new file mode 100644 index 0000000..433f2e9 Binary files /dev/null and b/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_dir.png differ diff --git a/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_dir.png.meta b/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_dir.png.meta new file mode 100644 index 0000000..97e6e10 --- /dev/null +++ b/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_dir.png.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: 332b5870810e2fe468bc45366a7b66e2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_light.exr b/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_light.exr new file mode 100644 index 0000000..ec77e45 Binary files /dev/null and b/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_light.exr differ diff --git a/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_light.exr.meta b/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_light.exr.meta new file mode 100644 index 0000000..9d25adf --- /dev/null +++ b/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_light.exr.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: 7e7c9c568c9a8eb41b92a68bd5dea134 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameObjects/Scenes/TestScene/ReflectionProbe-0.exr b/Assets/GameObjects/Scenes/TestScene/ReflectionProbe-0.exr new file mode 100644 index 0000000..b262735 Binary files /dev/null and b/Assets/GameObjects/Scenes/TestScene/ReflectionProbe-0.exr differ diff --git a/Assets/GameObjects/Scenes/TestScene/ReflectionProbe-0.exr.meta b/Assets/GameObjects/Scenes/TestScene/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..87ba400 --- /dev/null +++ b/Assets/GameObjects/Scenes/TestScene/ReflectionProbe-0.exr.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: 17bce14b796b7c240a244d66009eebf2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Graphics/Models/Levels/Stardust/Stardust.fbx b/Assets/Graphics/Models/Levels/Stardust/Stardust.fbx index c59cfcb..7c23c07 100644 Binary files a/Assets/Graphics/Models/Levels/Stardust/Stardust.fbx and b/Assets/Graphics/Models/Levels/Stardust/Stardust.fbx differ diff --git a/Assets/Graphics/Models/Levels/Stardust/Stardust.fbx.meta b/Assets/Graphics/Models/Levels/Stardust/Stardust.fbx.meta index cebeacb..d1eed34 100644 --- a/Assets/Graphics/Models/Levels/Stardust/Stardust.fbx.meta +++ b/Assets/Graphics/Models/Levels/Stardust/Stardust.fbx.meta @@ -3,7 +3,22 @@ guid: 4b9b55215c46317428803b7adeda89c3 ModelImporter: serializedVersion: 20101 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: BlueGround + second: {fileID: 2100000, guid: 05285df80ba735149ab08e73d5dc648c, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: NeutralGround + second: {fileID: 2100000, guid: fd7c5ef02d4d095439b30549aa9c1987, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: OrangeGround + second: {fileID: 2100000, guid: 05e96b7f913b5604797c4a6ecd0b1e35, type: 2} materials: materialImportMode: 1 materialName: 0 @@ -36,7 +51,7 @@ ModelImporter: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 - addColliders: 0 + addColliders: 1 useSRGBMaterialColor: 1 sortHierarchyByName: 1 importVisibility: 1 diff --git a/RawAssets/Stardust/Stardust.blend b/RawAssets/Stardust/Stardust.blend index b20ee4f..b245822 100644 Binary files a/RawAssets/Stardust/Stardust.blend and b/RawAssets/Stardust/Stardust.blend differ