From b74123188b1f9f3ff5fdba4bbbca1acef7cf1a1a Mon Sep 17 00:00:00 2001 From: MelekTaus Moribundus Date: Tue, 7 Jul 2026 13:28:49 +0200 Subject: [PATCH] Setup lighting (GI, AO) --- .gitignore | 4 + Assets/Resources/UnityGLTFSettings.asset | 440 ++++++++++++++++-- Assets/Scenes/Lobby.unity | 13 + Assets/Scenes/Main.unity | 293 ++++++++++++ Assets/Scenes/Test Map.unity | 13 + Assets/Scenes/The Room.unity | 15 +- .../Components/DirectionalLightForHTrace.cs | 14 + .../DirectionalLightForHTrace.cs.meta | 2 + Assets/Settings/PC_RPAsset.asset | 2 +- Assets/Settings/PC_Renderer.asset | 53 ++- Assets/Settings/SampleSceneProfile.asset | 39 +- ProjectSettings/EditorSettings.asset | 2 +- ProjectSettings/GraphicsSettings.asset | 6 + 13 files changed, 841 insertions(+), 55 deletions(-) create mode 100644 Assets/Scripts/Components/DirectionalLightForHTrace.cs create mode 100644 Assets/Scripts/Components/DirectionalLightForHTrace.cs.meta diff --git a/.gitignore b/.gitignore index 2606bd6..8a83631 100644 --- a/.gitignore +++ b/.gitignore @@ -89,6 +89,10 @@ crashlytics-build.properties /Assets/FR2_Cache.asset # Excluded Assets and Plugins +/Assets/HTraceAO.meta +/Assets/HTraceAO/ +/Assets/HTraceWSGI.meta +/Assets/HTraceWSGI/ /Assets/Plugins.meta /Assets/Plugins/Roslyn.meta /Assets/Plugins/Roslyn/ diff --git a/Assets/Resources/UnityGLTFSettings.asset b/Assets/Resources/UnityGLTFSettings.asset index 01b5e2f..ece4a95 100644 --- a/Assets/Resources/UnityGLTFSettings.asset +++ b/Assets/Resources/UnityGLTFSettings.asset @@ -1,5 +1,207 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8966799875465677876 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 056f401eae1a4f76b6f580ebf76127a9, type: 3} + m_Name: GPUInstancingImport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.GPUInstancingImport + enabled: 1 +--- !u!114 &-8732581604916125580 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5152940c6ada2f3449baca5def38ea64, type: 3} + m_Name: MaterialExtensionsExport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.MaterialExtensionsExport + enabled: 1 + KHR_materials_ior: 1 + KHR_materials_transmission: 1 + KHR_materials_volume: 1 + KHR_materials_iridescence: 1 + KHR_materials_specular: 1 + KHR_materials_clearcoat: 1 + KHR_materials_emissive_strength: 1 + KHR_materials_sheen: 1 + KHR_materials_anisotropy: 1 +--- !u!114 &-7892728825374371386 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13416558369ebcb46a99c28ceb137930, type: 3} + m_Name: VisualScriptingExportPlugin + m_EditorClassIdentifier: UnityGLTF.Interactivity.VisualScripting.ExportPlugin::UnityGLTF.Interactivity.VisualScripting.VisualScriptingExportPlugin + enabled: 0 + cleanUpAndOptimizeExportedGraph: 1 +--- !u!114 &-7371309442679715770 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f2b6fa8618a247c3a77768773459dcd5, type: 3} + m_Name: VisibilityExport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.VisibilityExport + enabled: 0 +--- !u!114 &-7127027474161929152 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d9fe28b7eb945fd891714c55c74f44b, type: 3} + m_Name: CanvasExport + m_EditorClassIdentifier: UnityGLTF.Plugins::UnityGLTF.Plugins.CanvasExport + enabled: 0 +--- !u!114 &-6629566426457488816 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5dd4c08c7d6d71f4ca7d83fb653d4f9b, type: 3} + m_Name: TextMeshGameObjectExport + m_EditorClassIdentifier: UnityGLTF.Plugins::UnityGLTF.Plugins.TextMeshGameObjectExport + enabled: 1 +--- !u!114 &-6259629064269384377 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 837601ceb763400cadb3575e55885670, type: 3} + m_Name: MeshoptImport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.MeshoptImport + enabled: 1 +--- !u!114 &-5199177232277179928 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 984138db70144b97b48597182a21b46c, type: 3} + m_Name: TextureTransformExport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.TextureTransformExport + enabled: 1 +--- !u!114 &-4554920311754134629 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3579a4c311b8427f81a0c1a29e9acfe8, type: 3} + m_Name: LightsPunctualExport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.LightsPunctualExport + enabled: 1 +--- !u!114 &-4077639219806164312 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6d87ebf60834245a388cd150253839d, type: 3} + m_Name: AnimationPointerExport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.AnimationPointerExport + enabled: 0 +--- !u!114 &-3933429694113458518 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d106e4b0674b44e09e9c8d85ba6216df, type: 3} + m_Name: AudioImport + m_EditorClassIdentifier: UnityGLTF.Plugins::UnityGLTF.Plugins.AudioImport + enabled: 0 +--- !u!114 &-2780486667595481753 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d19ac0d23e84c248f196d1afbe9b9d0, type: 3} + m_Name: MaterialExtensionsImport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.MaterialExtensionsImport + enabled: 1 + KHR_materials_ior: 1 + KHR_materials_transmission: 1 + KHR_materials_volume: 1 + KHR_materials_iridescence: 1 + KHR_materials_specular: 1 + KHR_materials_clearcoat: 1 + KHR_materials_sheen: 1 + KHR_materials_pbrSpecularGlossiness: 1 + KHR_materials_emissive_strength: 1 + KHR_materials_anisotropy: 1 +--- !u!114 &-1481127050213778493 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7dca6a7cdc544a17b19918041bc59d14, type: 3} + m_Name: DracoImport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.DracoImport + enabled: 1 +--- !u!114 &-1108464469265858957 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a3011a000a64498d8297909d5cc472a, type: 3} + m_Name: SpriteRendererExport + m_EditorClassIdentifier: UnityGLTF.Plugins::UnityGLTF.Plugins.SpriteRendererExport + enabled: 1 --- !u!114 &1 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17,35 +219,35 @@ MonoBehaviour: stripPassesFromAllShaders: 0 stripPasses: 0 ImportPlugins: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + - {fileID: -2780486667595481753} + - {fileID: 8399303770538749428} + - {fileID: -1481127050213778493} + - {fileID: 1771551029574924298} + - {fileID: 7403643380600008376} + - {fileID: -8966799875465677876} + - {fileID: 248244174439585646} + - {fileID: 7397006775109609522} + - {fileID: 6337214665343928412} + - {fileID: 7320917142846113217} + - {fileID: -6259629064269384377} + - {fileID: 9196692481575861507} + - {fileID: 3327043765163232345} + - {fileID: -3933429694113458518} ExportPlugins: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + - {fileID: -4077639219806164312} + - {fileID: -7371309442679715770} + - {fileID: -5199177232277179928} + - {fileID: -4554920311754134629} + - {fileID: 7607908894707010630} + - {fileID: -8732581604916125580} + - {fileID: 5842986558387065917} + - {fileID: 8752950078375276897} + - {fileID: 8177596783083732744} + - {fileID: 3409017367995099595} + - {fileID: -6629566426457488816} + - {fileID: -1108464469265858957} + - {fileID: -7127027474161929152} + - {fileID: -7892728825374371386} exportNames: 1 exportFullPath: 0 EditorExportTransformMode: 0 @@ -63,3 +265,185 @@ MonoBehaviour: blendShapeExportSparseAccessors: 1 exportVertexColors: 1 UseCaching: 1 +--- !u!114 &248244174439585646 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60bb1ecd8af04e0e864c773a2aaf6263, type: 3} + m_Name: TextureTransformImport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.TextureTransformImport + enabled: 1 +--- !u!114 &1771551029574924298 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d48839dd2db84f9f94ec4e3bb77e9f9e, type: 3} + m_Name: LightsPunctualImport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.LightsPunctualImport + enabled: 1 +--- !u!114 &3327043765163232345 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 969cbb3ac6864c2f9e49e468eef2744c, type: 3} + m_Name: Ktx2Import + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.Ktx2Import + enabled: 1 +--- !u!114 &3409017367995099595 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c85d7bc6d6ea44f46b33f0a3a2e09283, type: 3} + m_Name: BakeParticleSystem + m_EditorClassIdentifier: UnityGLTF.Plugins::UnityGLTF.Plugins.BakeParticleSystem + enabled: 0 +--- !u!114 &5842986558387065917 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e63c00ddf0924f0c8bd05f7f16935dfe, type: 3} + m_Name: LodsExport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.LodsExport + enabled: 1 +--- !u!114 &6337214665343928412 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 473c2b5b3de547139304b32beee641e9, type: 3} + m_Name: AnimationPointerImport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.AnimationPointerImport + enabled: 1 +--- !u!114 &7320917142846113217 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d3bb2aeeab442db8c587d6e67450acc, type: 3} + m_Name: UnlitMaterialsImport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.UnlitMaterialsImport + enabled: 1 +--- !u!114 &7397006775109609522 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5d73111d7b6493da937accca1adfe6a, type: 3} + m_Name: WebpImport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.WebpImport + enabled: 1 +--- !u!114 &7403643380600008376 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2239c10507484fb78bb19067a66500f2, type: 3} + m_Name: LodsImport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.LodsImport + enabled: 1 +--- !u!114 &7607908894707010630 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9571021a85f04ddfb74e8aa5aad9cc5a, type: 3} + m_Name: UnlitMaterialsExport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.UnlitMaterialsExport + enabled: 1 +--- !u!114 &8177596783083732744 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a59cc7d090dc43ef86b454e445bdbf9a, type: 3} + m_Name: AudioExport + m_EditorClassIdentifier: UnityGLTF.Plugins::UnityGLTF.Plugins.AudioExport + enabled: 0 +--- !u!114 &8399303770538749428 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 06b516fa9f5941be92bd6cecf2dd5ca5, type: 3} + m_Name: VisibilityImport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.VisibilityImport + enabled: 1 +--- !u!114 &8752950078375276897 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5066402b4fbd41e79ab3d7023cca96c5, type: 3} + m_Name: MaterialVariantsPlugin + m_EditorClassIdentifier: UnityGLTF.Plugins::UnityGLTF.Plugins.MaterialVariantsPlugin + enabled: 1 +--- !u!114 &9196692481575861507 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de1f726221454139bfcce49d994d9d05, type: 3} + m_Name: ExrImport + m_EditorClassIdentifier: UnityGLTFScripts::UnityGLTF.Plugins.ExrImport + enabled: 1 diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index eebb881..4c271e7 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -1026,6 +1026,7 @@ GameObject: - component: {fileID: 2111920474} - component: {fileID: 2111920473} - component: {fileID: 2111920472} + - component: {fileID: 2111920475} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -1142,6 +1143,18 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!114 &2111920475 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2111920471} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a6c630d5fd87a74c8f73da438a45446, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::DirectionalLightForHTrace --- !u!1 &2141865149 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index f39a9cd..b498389 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -344,6 +344,117 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 127594278} m_CullTransparentMesh: 1 +--- !u!114 &148581598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f7fc1118bd8474945bef4f4da0791ea3, type: 3} + m_Name: New HTrace AO Profile + m_EditorClassIdentifier: HTraceAO.Rendering::HTraceAO.Rendering.Shared.Data.Profile.HTraceAOProfile + GeneralSettings: + HBuffer: 0 + AmbientOcclusionMode: 1 + _intensity: 1 + OutputDithering: 0 + OutputDitheringAnimate: 0 + _directLightOcclusion: 0.2 + Fadeout: 100 + InjectionPoint: 1 + ReconstructNormals: 0 + SSAOSettings: + DebugModeSSAO: 0 + ExcludeCasting: + serializedVersion: 0 + m_Bits: 0 + ExcludeReceiving: + serializedVersion: 0 + m_Bits: 0 + _excludedIntensity: 0 + _thickness: 0 + _radius: 2 + GTAOSettings: + DebugMode: 0 + _thickness: 0.15 + _worldSpaceRadius: 1 + _screenSpaceRadius: 25 + _sliceCount: 2 + _stepCount: 16 + Resolution: 1 + TracingMode: 1 + DepthFormat: 0 + ThicknessMode: 0 + UseAttenuation: 1 + Denoising: 3 + UseSimpleRejection: 0 + _temporalRejection: 0.8 + _sampleCountTemporal: 8 + ReprojectionFilter: 0 + UseNormalWeightingTemporal: 1 + SpatialFilterType: 1 + _filterRadius: 0.5 + _filterAdaptivity: 0.5 + _boxPassCount: 2 + DoubleSampleCount: 0 + ExcludeCasting: + serializedVersion: 0 + m_Bits: 0 + ExcludeReceiving: + serializedVersion: 0 + m_Bits: 0 + _excludedIntensity: 0 + RTAOSettings: + DebugMode: 0 + DebugSceneMismatch: 0 + _worldSpaceRadius: 1 + _maxRayBias: 0.001 + _specularOcclusion: 0.5 + TracingMode: 1 + _rayCount: 4 + SampleRebalancing: 0 + CullBackfaces: 0 + CullAlphaCutout: 0 + CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + ScreenSpacePretrace: 0 + PretraceMask: + serializedVersion: 0 + m_Bits: 1 + _pretraceSamples: 12 + _pretraceDistance: 0.5 + _pretraceThickness: 0.1 + CullingMode: 0 + _cullingDistance: 100 + _minSolidAngle: 1 + Resolution: 3 + Denoising: 2 + _sampleCountTemporal: 16 + _staticRejection: 0.1 + _dynamicRejection: 0.3 + ReprojectionFilter: 0 + UseNormalWeightingTemporal: 1 + DisocclusionBoost: 1 + _filterRadius: 0.5 + _contactOcclusion: 0 + ContactOcclusionDenoise: 1 + ExcludeReceiving: + serializedVersion: 0 + m_Bits: 0 + _excludedIntensity: 0 + DebugSettings: + ShowBowels: 0 + ShowFullDebugLog: 0 + HTraceLayer: + serializedVersion: 2 + m_Bits: 4294967295 + TestCheckBox1: 0 + TestCheckBox2: 0 + TestCheckBox3: 0 --- !u!1 &172071430 GameObject: m_ObjectHideFlags: 0 @@ -1071,6 +1182,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1036779881} + - {fileID: 1419977427} + - {fileID: 1164194066} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 14.96, y: 0, z: 0} --- !u!114 &330585547 @@ -2556,6 +2669,51 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &1164194065 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1164194066} + - component: {fileID: 1164194067} + m_Layer: 0 + m_Name: HTraceAO + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1164194066 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1164194065} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 330585546} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1164194067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1164194065} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f3146f0c6491b7d47bcd03c578f7dfb4, type: 3} + m_Name: + m_EditorClassIdentifier: HTraceAO.Rendering::HTraceAO.Rendering.HTraceAO + Profile: {fileID: 148581598} --- !u!1 &1171673579 GameObject: m_ObjectHideFlags: 0 @@ -4927,6 +5085,141 @@ MonoBehaviour: fadeInSpeed: 5 fadeOutSpeed: 3 hiddenScale: 0.8 +--- !u!1 &1419977425 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1419977427} + - component: {fileID: 1419977426} + m_Layer: 0 + m_Name: HTraceWSGI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1419977426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419977425} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aea289474a4f4fdcb217aa68772e5da2, type: 3} + m_Name: + m_EditorClassIdentifier: HTraceWSGI::HTraceWSGI.Scripts.HTraceWSGI + GeneralSettings: + DebugModeWS: 0 + HBuffer: 0 + VolumetricDebug: 1 + _intensity: 2 + AmbientOverride: 1 + MetallicIndirectFallback: 1 + _renderScale: 1 + TracingMode: 0 + _rayCountMode: 0 + _rayLength: 50 + Multibounce: 1 + ExcludeCastingMask: + serializedVersion: 0 + m_Bits: 0 + ExcludeReceivingMask: + serializedVersion: 0 + m_Bits: 0 + VoxelizationSettings: + ExactData: + Resolution: {x: 352, y: 352, z: 352} + Bounds: {x: 35.2, y: 35.2, z: 35.2} + VoxelizationMask: + serializedVersion: 2 + m_Bits: 4294967295 + VoxelizationUpdateMode: 0 + _updatePeriod: 1 + AttachTo: {fileID: 330585546} + _lodMax: 0 + InstancedTerrains: + serializedVersion: 2 + m_Bits: 0 + CulledObjectsMask: + serializedVersion: 2 + m_Bits: 0 + _expandCullFov: 0 + _expandCullRadius: 1 + DynamicObjectsMask: + serializedVersion: 2 + m_Bits: 0 + _voxelDensity: 0.64 + _voxelBounds: 35 + _overrideBoundsHeightEnable: 0 + _overrideBoundsHeight: 35 + CenterShift: 0 + GroundLevelEnable: 0 + GroundLevel: 0 + LightingSettings: + DirectionalLight: {fileID: 0} + _surfaceDiffuseIntensity: 1 + _directionalLightIntensity: 1 + _skyLightIntensity: 1 + _expandShadowmap: 1 + _shadowmapRange: 100 + ShadowmapUpdateMode: 0 + EvaluatePunctualLights: 0 + _lightClusterCellLightCount: 8 + _lightClusterCellDensity: 16 + _lightClusterRange: 100 + ScreenSpaceLightingSettings: + EvaluateHitLighting: 0 + DirectionalOcclusion: 1 + _occlusionIntensity: 0.25 + ReflectionIndirectLightingSettings: + IndirectEvaluationMethod: 0 + _rayBias: 0.5 + _maxRayLength: 100 + SpatialRadius: 1 + _jitterRadius: 0.5 + TemporalJitter: 1 + OcclusionCheck: 0 + DebugSettings: + _enableDebug: 1 + AttachToSceneCamera: 1 + CameraForTests: {fileID: 0} + EnableCamerasVisualization: 0 + ShowBowels: 0 + ShowFullDebugLog: 0 + TestCheckbox: 0 + RenderTexture: {fileID: 0} + HTraceLayer: + serializedVersion: 2 + m_Bits: 4294967295 + _globalSettingsTab: 1 + _screenSpaceLightingTab: 0 + _wsgiTab: 0 + _lightingTab: 1 + _reflectionsTab: 1 + _debugTab: 1 + _showVoxelParams: 1 + _showUpdateOptions: 1 +--- !u!4 &1419977427 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419977425} + serializedVersion: 2 + m_LocalRotation: {x: -0.1305262, y: -2.1996925e-11, z: 4.1198815e-12, w: 0.9914449} + m_LocalPosition: {x: 0, y: -1.8111109, z: 4.9852858} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 330585546} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1516578026 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Test Map.unity b/Assets/Scenes/Test Map.unity index df891a4..a183ff6 100644 --- a/Assets/Scenes/Test Map.unity +++ b/Assets/Scenes/Test Map.unity @@ -1318,6 +1318,7 @@ GameObject: - component: {fileID: 410087041} - component: {fileID: 410087040} - component: {fileID: 410087042} + - component: {fileID: 410087043} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -1434,6 +1435,18 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_RenderingLayers: 1 m_ShadowRenderingLayers: 1 +--- !u!114 &410087043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410087039} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a6c630d5fd87a74c8f73da438a45446, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::DirectionalLightForHTrace --- !u!1001 &417343357 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/The Room.unity b/Assets/Scenes/The Room.unity index a6e4b1b..051bf84 100644 --- a/Assets/Scenes/The Room.unity +++ b/Assets/Scenes/The Room.unity @@ -14992,6 +14992,7 @@ GameObject: - component: {fileID: 2009023824} - component: {fileID: 2009023823} - component: {fileID: 2009023822} + - component: {fileID: 2009023825} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -15039,7 +15040,7 @@ Light: serializedVersion: 12 m_Type: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1.5 + m_Intensity: 1.75 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -15108,6 +15109,18 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 72.9, y: 19.7, z: 0} +--- !u!114 &2009023825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2009023821} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a6c630d5fd87a74c8f73da438a45446, type: 3} + m_Name: + m_EditorClassIdentifier: '::' --- !u!1001 &2041471715 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Components/DirectionalLightForHTrace.cs b/Assets/Scripts/Components/DirectionalLightForHTrace.cs new file mode 100644 index 0000000..29ed928 --- /dev/null +++ b/Assets/Scripts/Components/DirectionalLightForHTrace.cs @@ -0,0 +1,14 @@ +using System.Collections; +using UnityEngine; + +public class DirectionalLightForHTrace : MonoBehaviour +{ + IEnumerator Start() + { + var gi = FindAnyObjectByType(); + if (!gi) yield break; + gi.gameObject.SetActive(false); + yield return null; + gi.gameObject.SetActive(true); + } +} diff --git a/Assets/Scripts/Components/DirectionalLightForHTrace.cs.meta b/Assets/Scripts/Components/DirectionalLightForHTrace.cs.meta new file mode 100644 index 0000000..84b372f --- /dev/null +++ b/Assets/Scripts/Components/DirectionalLightForHTrace.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3a6c630d5fd87a74c8f73da438a45446 \ No newline at end of file diff --git a/Assets/Settings/PC_RPAsset.asset b/Assets/Settings/PC_RPAsset.asset index fbd68ed..3113004 100644 --- a/Assets/Settings/PC_RPAsset.asset +++ b/Assets/Settings/PC_RPAsset.asset @@ -58,7 +58,7 @@ MonoBehaviour: m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 m_Cascade3Split: {x: 0.1, y: 0.3} - m_Cascade4Split: {x: 0.105, y: 0.262, z: 0.5} + m_Cascade4Split: {x: 0.16637196, y: 0.3727101, z: 0.64320123} m_CascadeBorder: 0 m_ShadowDepthBias: 0.1 m_ShadowNormalBias: 0.5 diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index cd02228..ac982f6 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -1,5 +1,32 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-113243848881436404 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d838efc3f4a3bf84b9925b7da1b23a35, type: 3} + m_Name: HTrace Ambient Occlusion + m_EditorClassIdentifier: HTraceAO.Rendering::HTraceAO.Rendering.URP.Infrastructure.HTraceAORendererFeature + m_Active: 1 + m_Settings: + AOMethod: 0 + Downsample: 0 + AfterOpaque: 0 + Source: 1 + NormalSamples: 1 + Intensity: 3 + DirectLightingStrength: 0.25 + Radius: 0.035 + Samples: 1 + BlurQuality: 0 + Falloff: 100 + SampleCount: -1 + UseVolumes: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -25,9 +52,10 @@ MonoBehaviour: probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, type: 3} probeVolumeBlendStatesCS: {fileID: 7200000, guid: b9a23f869c4fd45f19c5ada54dd82176, type: 3} m_RendererFeatures: - - {fileID: 7833122117494664109} - {fileID: 6245067092740157231} - m_RendererFeatureMap: ad6b866f10d7b46c2f2f42dd6eefaa56 + - {fileID: 6568133994623751083} + - {fileID: -113243848881436404} + m_RendererFeatureMap: 2f2f42dd6eefaa56 m_UseNativeRenderPass: 1 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} m_AssetVersion: 3 @@ -98,7 +126,7 @@ MonoBehaviour: restoreCamera: 1 offset: {x: 0, y: 0, z: 0, w: 0} cameraFieldOfView: 60 ---- !u!114 &7833122117494664109 +--- !u!114 &6568133994623751083 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -107,20 +135,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3} - m_Name: ScreenSpaceAmbientOcclusion - m_EditorClassIdentifier: + m_Script: {fileID: 11500000, guid: 94e17f564a7acaf43aa4f96d678cbd0f, type: 3} + m_Name: HTrace World Space Global Illumination + m_EditorClassIdentifier: HTraceWSGI::HTraceWSGI.Scripts.Infrastructure.URP.HTraceWSGIRendererFeature m_Active: 1 - m_Settings: - AOMethod: 1 - Downsample: 0 - AfterOpaque: 0 - Source: 1 - NormalSamples: 1 - Intensity: 0.35 - DirectLightingStrength: 0.25 - Radius: 0.125 - Samples: 0 - BlurQuality: 0 - Falloff: 100 - SampleCount: -1 diff --git a/Assets/Settings/SampleSceneProfile.asset b/Assets/Settings/SampleSceneProfile.asset index b607125..d3fb430 100644 --- a/Assets/Settings/SampleSceneProfile.asset +++ b/Assets/Settings/SampleSceneProfile.asset @@ -71,7 +71,7 @@ MonoBehaviour: m_Value: {x: 0.5, y: 0.5} intensity: m_OverrideState: 1 - m_Value: 0.1 + m_Value: 0.12 smoothness: m_OverrideState: 0 m_Value: 0.2 @@ -93,13 +93,13 @@ MonoBehaviour: active: 1 lift: m_OverrideState: 1 - m_Value: {x: 1, y: 1, z: 1, w: -0.018951265} + m_Value: {x: 1, y: 1, z: 1, w: -0.010575896} gamma: m_OverrideState: 1 - m_Value: {x: 1, y: 1, z: 1, w: 0.016845778} + m_Value: {x: 1, y: 1, z: 1, w: 0.11725345} gain: m_OverrideState: 1 - m_Value: {x: 1, y: 1, z: 1, w: 0.3011148} + m_Value: {x: 1, y: 1, z: 1, w: 0.13819152} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -114,6 +114,7 @@ MonoBehaviour: m_EditorClassIdentifier: components: - {fileID: 849379129802519247} + - {fileID: 5486779309537155362} - {fileID: -2861522193539684274} - {fileID: -7893295128165547882} - {fileID: 7391319092446245454} @@ -133,7 +134,7 @@ MonoBehaviour: active: 1 mode: m_OverrideState: 1 - m_Value: 1 + m_Value: 2 neutralHDRRangeReductionMode: m_OverrideState: 0 m_Value: 2 @@ -158,6 +159,34 @@ MonoBehaviour: maxNits: m_OverrideState: 1 m_Value: 647 +--- !u!114 &5486779309537155362 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66f335fb1ffd8684294ad653bf1c7564, type: 3} + m_Name: ColorAdjustments + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.ColorAdjustments + active: 1 + postExposure: + m_OverrideState: 1 + m_Value: 0.5 + contrast: + m_OverrideState: 1 + m_Value: -5 + colorFilter: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hueShift: + m_OverrideState: 0 + m_Value: 0 + saturation: + m_OverrideState: 1 + m_Value: 8 --- !u!114 &7391319092446245454 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 679594f..878c4cb 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -25,7 +25,7 @@ EditorSettings: m_AsyncShaderCompilation: 1 m_PrefabModeAllowAutoSave: 1 m_EnterPlayModeOptionsEnabled: 1 - m_EnterPlayModeOptions: 3 + m_EnterPlayModeOptions: 0 m_GameObjectNamingDigits: 1 m_GameObjectNamingScheme: 0 m_AssetNamingUsesSpace: 1 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 3e70d29..bb68a1b 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,6 +38,12 @@ GraphicsSettings: - {fileID: 4800000, guid: 387abc652c7ac1c449701bdfcf9d0f8b, type: 3} - {fileID: 4800000, guid: 0b7306b5c0c771147ab18037e40a820d, type: 3} - {fileID: 4800000, guid: 8584f72f2fa12c1489898d805b793315, type: 3} + - {fileID: 4800000, guid: c3a0cd0caf5f43149c1e3177309b8223, type: 3} + - {fileID: 4800000, guid: e862d8907c85cbc4ea109bfe71614ea9, type: 3} + - {fileID: 4800000, guid: e492117e834a6544a875878581bb0c4a, type: 3} + - {fileID: 4800000, guid: 6f7f91bedc42bda418c5a03b4b7e3f2a, type: 3} + - {fileID: 4800000, guid: 1fa31432553d47d5a7b5be6bc675e199, type: 3} + - {fileID: 4800000, guid: 2991b564835a4e03b8f03b88f34d0bc6, type: 3} m_PreloadedShaders: [] m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}