Mercury/Looking-Glass
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed realtime lights but now lightmaps are giving weird artifiacts and bleed

Browse source
This commit is contained in:
LOLthecool 2024-02-13 19:00:24 +00:00
parent 11d0370492
commit 43d1854183
16 changed files with 164 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

257
Assets/Scenes/IntroLevel.unity
View file

@ -236,6 +236,11 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &223021657 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
m_PrefabInstance: {fileID: 1521720146}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &346403936
PrefabInstance:
m_ObjectHideFlags: 0
@ -456,6 +461,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_CastShadows
value: 1
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_ReceiveShadows
value: 0
@ -781,6 +790,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_MinimumChartSize
value: 4
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_Name
value: introLevel-Blockup
@ -908,6 +921,100 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
--- !u!1 &1548563261
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1548563262}
- component: {fileID: 1548563263}
m_Layer: 0
m_Name: Point Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &1548563262
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1548563261}
m_LocalRotation: {x: 0.00000005960463, y: 9.473118e-16, z: -7.1054265e-15, w: 1}
m_LocalPosition: {x: -0, y: 0, z: -0.00073}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2014617382}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!108 &1548563263
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1548563261}
m_Enabled: 1
serializedVersion: 10
m_Type: 2
m_Shape: 0
m_Color: {r: 1, g: 0.98952883, b: 0.7643979, a: 1}
m_Intensity: 0.1
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: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1001 &1583806684
PrefabInstance:
m_ObjectHideFlags: 0
@ -989,7 +1096,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
--- !u!1 &1703324558
--- !u!1 &1658092939
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -997,37 +1104,37 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1703324559}
- component: {fileID: 1703324560}
- component: {fileID: 1658092940}
- component: {fileID: 1658092941}
m_Layer: 0
m_Name: Spot Light
m_Name: Point Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1703324559
m_IsActive: 0
--- !u!4 &1658092940
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1703324558}
m_GameObject: {fileID: 1658092939}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0, y: -0.00005, z: -0.00177}
m_LocalPosition: {x: -0, y: 0, z: -0.00069}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2014617382}
m_Father: {fileID: 223021657}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!108 &1703324560
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!108 &1658092941
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1703324558}
m_GameObject: {fileID: 1658092939}
m_Enabled: 1
serializedVersion: 10
m_Type: 2
@ -1204,100 +1311,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
m_PrefabInstance: {fileID: 848105196}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2080032009
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2080032010}
- component: {fileID: 2080032011}
m_Layer: 0
m_Name: Spot Light (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2080032010
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2080032009}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0, y: -0.0163, z: -0.00152}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2014617382}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!108 &2080032011
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2080032009}
m_Enabled: 1
serializedVersion: 10
m_Type: 2
m_Shape: 0
m_Color: {r: 1, g: 0.98952883, b: 0.7643979, a: 1}
m_Intensity: 0.1
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: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1001 &2082639886
PrefabInstance:
m_ObjectHideFlags: 0
@ -1386,6 +1399,26 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4089286530596214869, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_CastShadows
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4089286530596214869, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_ScaleInLightmap
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4089286530596214875, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_StaticEditorFlags
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4089286531079030848, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_StaticEditorFlags
value: 127
objectReference: {fileID: 0}
- target: {fileID: 4089286531079030850, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_ScaleInLightmap
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4089286531257402898, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_Name
value: door1
@ -1434,6 +1467,18 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4089286531439898589, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_StaticEditorFlags
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4089286531439898591, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_CastShadows
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4089286531439898591, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_ScaleInLightmap
value: 3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
--- !u!1001 &8449482749711574517

BIN
Assets/Scenes/IntroLevel/LightingData.asset
View file

Binary file not shown.

BIN
Assets/Scenes/IntroLevel/Lightmap-0_comp_dir.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 764 KiB

After

Width:  |  Height:  |  Size: 766 KiB

2
Assets/Scenes/IntroLevel/Lightmap-0_comp_dir.png.meta
View file

@ -70,7 +70,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

BIN
Assets/Scenes/IntroLevel/Lightmap-0_comp_light.exr
View file

Binary file not shown.

2
Assets/Scenes/IntroLevel/Lightmap-0_comp_light.exr.meta
View file

@ -70,7 +70,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

BIN
Assets/Scenes/IntroLevel/Lightmap-1_comp_dir.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 47 KiB

2
Assets/Scenes/IntroLevel/Lightmap-1_comp_dir.png.meta
View file

@ -70,7 +70,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

BIN
Assets/Scenes/IntroLevel/Lightmap-1_comp_light.exr
View file

Binary file not shown.

2
Assets/Scenes/IntroLevel/Lightmap-1_comp_light.exr.meta
View file

@ -70,7 +70,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

10
Assets/lighting settings/quicklighting.lighting
View file

@ -10,23 +10,23 @@ LightingSettings:
serializedVersion: 4
m_GIWorkflowMode: 1
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 1
m_RealtimeEnvironmentLighting: 1
m_EnableRealtimeLightmaps: 0
m_RealtimeEnvironmentLighting: 0
m_BounceScale: 1
m_AlbedoBoost: 1
m_IndirectOutputScale: 1
m_UsingShadowmask: 0
m_UsingShadowmask: 1
m_BakeBackend: 2
m_LightmapMaxSize: 2048
m_BakeResolution: 32
m_Padding: 16
m_LightmapCompression: 3
m_LightmapCompression: 0
m_AO: 0
m_AOMaxDistance: 2
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAO: 0
m_MixedBakeMode: 0
m_MixedBakeMode: 2
m_LightmapsBakeMode: 1
m_FilterMode: 1
m_LightmapParameters: {fileID: 15201, guid: 0000000000000000f000000000000000, type: 0}

33
Assets/materials/SkyNight.mat
View file

@ -1,33 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SkyNight
m_Shader: {fileID: 103, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _Tex:
m_Texture: {fileID: 8900000, guid: d6614748edcc0324aad9c089e4887991, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Exposure: 1
- _Rotation: 0
m_Colors:
- _Tint: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
m_BuildTextureStacks: []

8
Assets/materials/SkyNight.mat.meta
View file

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

2
Assets/materials/defaultmat.mat
View file

@ -12,7 +12,7 @@ Material:
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}

2
Assets/materials/light.mat
View file

@ -13,7 +13,7 @@ Material:
- _EMISSION
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}

4
ProjectSettings/QualitySettings.asset
View file

@ -45,7 +45,7 @@ QualitySettings:
excludedTargetPlatforms: []
- serializedVersion: 2
name: Low
pixelLightCount: 0
pixelLightCount: 4
shadows: 0
shadowResolution: 0
shadowProjection: 1
@ -63,7 +63,7 @@ QualitySettings:
softVegetation: 0
realtimeReflectionProbes: 0
billboardsFaceCameraPosition: 0
vSyncCount: 0
vSyncCount: 1
realtimeGICPUUsage: 25
lodBias: 0.4
maximumLODLevel: 0