ktyl
/
revival
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/lighting' into 'main' 

Fix/lighting

See merge request kernel-panic/revival!101
This commit is contained in:
Cinder Foster-Smith 2021-05-18 14:13:16 +00:00
parent cf2029095e 976a8b52df
commit 544e3cb9e4
19 changed files with 214 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/Assets/3D Assets/TRIM 1/Meshes/SunLightSettings.lighting
View File

@ -9,7 +9,7 @@ LightingSettings:
m_Name: SunLightSettings
serializedVersion: 3
m_GIWorkflowMode: 1
m_EnableBakedLightmaps: 1
m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0
m_RealtimeEnvironmentLighting: 1
m_BounceScale: 1

2
game/Assets/GlobalPostFX.asset
View File

@ -130,7 +130,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 97c23e3b12dc18c42a140437e53d3951, type: 3}
m_Name: Tonemapping
m_EditorClassIdentifier:
active: 0
active: 1
m_AdvancedMode: 0
mode:
m_OverrideState: 1

8
game/Assets/Prefabs/Lighting.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 09812bb3d12100446bbffd51a1bc0c67
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

95
game/Assets/Prefabs/Lighting/Directional Light.prefab Normal file
View File

@ -0,0 +1,95 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6650456247257185025
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6650456247257185027}
- component: {fileID: 6650456247257185024}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6650456247257185027
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6650456247257185025}
m_LocalRotation: {x: 0.7777426, y: 0.1032438, z: 0.22539774, w: 0.57762706}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 58.424, y: -243.812, z: -233.512}
--- !u!108 &6650456247257185024
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6650456247257185025}
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: 1.7
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: 4
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_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0

7
game/Assets/Prefabs/Lighting/Directional Light.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: cadf2742671be7341be4f0db8af4b86a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
game/Assets/Scenes/Boot.unity
View File

@ -26,7 +26,7 @@ RenderSettings:
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3

167
game/Assets/Scenes/Main.unity
View File

@ -37,8 +37,8 @@ RenderSettings:
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1418977833}
m_IndirectSpecularColor: {r: 0.44356447, g: 0.4928741, b: 0.57245904, a: 1}
m_Sun: {fileID: 6650456248541600042}
m_IndirectSpecularColor: {r: 0.5659695, g: 0.62747365, b: 0.64595413, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -760,99 +760,6 @@ Light:
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1 &1418977832
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1418977834}
- component: {fileID: 1418977833}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &1418977833
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1418977832}
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: 2
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: 4
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_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &1418977834
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1418977832}
m_LocalRotation: {x: 0.7777426, y: 0.1032438, z: 0.22539774, w: 0.57762706}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 58.424, y: -243.812, z: -233.512}
--- !u!1 &1509348080
GameObject:
m_ObjectHideFlags: 0
@ -1388,10 +1295,6 @@ PrefabInstance:
propertyPath: m_LocalRotation.z
value: 0.059314456
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223330, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_RendererIndex
value: -1
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223340, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: field of view
value: 60
@ -2892,6 +2795,72 @@ Transform:
m_CorrespondingSourceObject: {fileID: 289757988401398014, guid: d987369afb8f44a438b8c4893ec49608, type: 3}
m_PrefabInstance: {fileID: 6562875948616111523}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6650456248541600041
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 6650456247257185025, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
propertyPath: m_Name
value: Directional Light
objectReference: {fileID: 0}
- target: {fileID: 6650456247257185025, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6650456247257185027, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 6650456247257185027, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6650456247257185027, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6650456247257185027, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6650456247257185027, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
propertyPath: m_LocalRotation.w
value: 0.57762706
objectReference: {fileID: 0}
- target: {fileID: 6650456247257185027, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
propertyPath: m_LocalRotation.x
value: 0.7777426
objectReference: {fileID: 0}
- target: {fileID: 6650456247257185027, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
propertyPath: m_LocalRotation.y
value: 0.1032438
objectReference: {fileID: 0}
- target: {fileID: 6650456247257185027, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
propertyPath: m_LocalRotation.z
value: 0.22539774
objectReference: {fileID: 0}
- target: {fileID: 6650456247257185027, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 58.424
objectReference: {fileID: 0}
- target: {fileID: 6650456247257185027, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -243.812
objectReference: {fileID: 0}
- target: {fileID: 6650456247257185027, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -233.512
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
--- !u!108 &6650456248541600042 stripped
Light:
m_CorrespondingSourceObject: {fileID: 6650456247257185024, guid: cadf2742671be7341be4f0db8af4b86a, type: 3}
m_PrefabInstance: {fileID: 6650456248541600041}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6808448285084838146
PrefabInstance:
m_ObjectHideFlags: 0

BIN
game/Assets/Scenes/Main/LightingData.asset
View File

Binary file not shown.

BIN
game/Assets/Scenes/Main/Lightmap-0_comp_dir.png (Stored with Git LFS)
View File

Binary file not shown.

144
game/Assets/Scenes/Main/Lightmap-0_comp_dir.png.meta
View File

@ -1,144 +0,0 @@
fileFormatVersion: 2
guid: 62637b2d7727f524cadf8c3ab7833e41
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: 12
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
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:

BIN
game/Assets/Scenes/Main/Lightmap-0_comp_light.exr
View File

Binary file not shown.

BIN
game/Assets/Scenes/Main/ReflectionProbe-0.exr
View File

Binary file not shown.

8
game/Assets/Scenes/MainMenu.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3762778583210d94abbaa6a689b4a300
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

10
game/Assets/Scenes/MainMenu.unity
View File

@ -26,7 +26,7 @@ RenderSettings:
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_SkyboxMaterial: {fileID: 2100000, guid: 00813f190fa709741a622efe8ad62871, type: 2}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
@ -37,8 +37,8 @@ RenderSettings:
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_Sun: {fileID: 1340467634}
m_IndirectSpecularColor: {r: 0.5659695, g: 0.62747365, b: 0.64595413, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -97,7 +97,7 @@ LightmapSettings:
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingDataAsset: {fileID: 112000000, guid: ce5efbcf6fd9f334d809ea3b4f1cab90, type: 2}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
@ -1501,7 +1501,7 @@ Camera:
m_GameObject: {fileID: 1216022001}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.2924528, g: 0.2924528, b: 0.2924528, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2

BIN
game/Assets/Scenes/MainMenu/LightingData.asset Normal file
View File

Binary file not shown.

8
game/Assets/Scenes/MainMenu/LightingData.asset.meta Normal file
View File

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

BIN
game/Assets/Scenes/MainMenu/ReflectionProbe-0.exr Normal file
View File

Binary file not shown.

20
game/Assets/Scenes/Main/Lightmap-0_comp_light.exr.meta → game/Assets/Scenes/MainMenu/ReflectionProbe-0.exr.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 78dde9881eade0c419213c390c536d44
guid: 4a8cb8b687b752f40b65e837476c96b1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -21,19 +21,19 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
cubemapConvolution: 1
seamlessCubemap: 1
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
filterMode: 2
aniso: 0
mipBias: 0
wrapU: 1
wrapV: 1
@ -49,11 +49,11 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureShape: 1
textureType: 0
textureShape: 2
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
@ -69,7 +69,7 @@ TextureImporter:
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0

2
game/Assets/Scripts/Flow/Bootstrap.cs
View File

@ -278,6 +278,8 @@ public class Bootstrap : MonoBehaviour
while ( _activeScene.LoadComplete == false )
yield return null;
SceneManager.SetActiveScene(SceneManager.GetSceneByName(_activeSceneName));
// sync
_loadState = LoadState.Sync;