From 55a1f106ddc22a0023b950d42426159e7441ada3 Mon Sep 17 00:00:00 2001 From: Thorbjoern Date: Thu, 3 Jul 2025 23:32:55 +0200 Subject: [PATCH] Added Passthrough for loading screen and base scene --- Assets/_Scenes/TestSceneMeta Offline.unity | 234 ++++++++++++++++++++- Assets/_Scripts/Utility/FlushAndLoad.cs | 30 ++- 2 files changed, 253 insertions(+), 11 deletions(-) diff --git a/Assets/_Scenes/TestSceneMeta Offline.unity b/Assets/_Scenes/TestSceneMeta Offline.unity index 0ac187f..e3e717c 100644 --- a/Assets/_Scenes/TestSceneMeta Offline.unity +++ b/Assets/_Scenes/TestSceneMeta Offline.unity @@ -2403,7 +2403,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 364133819} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -2729,6 +2729,123 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3af7ca4916d35ee4ba154acde45dd813, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &464406823 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 464406826} + - component: {fileID: 464406825} + - component: {fileID: 464406824} + m_Layer: 0 + m_Name: '[BuildingBlock] Passthrough u' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &464406824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464406823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 555725d48e9051a4bb6b8d45178c2fdd, type: 3} + m_Name: + m_EditorClassIdentifier: + projectionSurfaceType: 0 + overlayType: 1 + compositionDepth: 0 + hidden: 0 + overridePerLayerColorScaleAndOffset: 0 + colorScale: {x: 1, y: 1, z: 1, w: 1} + colorOffset: {x: 0, y: 0, z: 0, w: 0} + passthroughLayerResumed: + m_PersistentCalls: + m_Calls: [] + colorMapEditorType_: 0 + colorMapEditorGradient: + serializedVersion: 2 + key0: {r: 0, g: 0, b: 0, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + colorMapEditorContrast: 0 + colorMapEditorBrightness: 0 + colorMapEditorPosterize: 0 + colorMapEditorSaturation: 0 + _colorLutSourceTexture: {fileID: 0} + _colorLutTargetTexture: {fileID: 0} + _lutWeight: 1 + _flipLutY: 1 + serializedSurfaceGeometry: [] + textureOpacity_: 1 + edgeRenderingEnabled_: 0 + edgeColor_: {r: 1, g: 1, b: 1, a: 1} + colorMapType: 0 +--- !u!114 &464406825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464406823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b023183069df224080314a560e6e1ff, type: 3} + m_Name: + m_EditorClassIdentifier: + blockId: f0540b20-dfd6-420e-b20d-c270f88dc77e + instanceId: c2f57cc2-90f9-4394-acdd-d48578e40cea + version: 1 + installationRoutineCheckpoint: + _installationRoutineId: + _installationVariants: [] +--- !u!4 &464406826 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464406823} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &466011856 GameObject: m_ObjectHideFlags: 0 @@ -3154,6 +3271,11 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 1085838646211357985, guid: 3142c30d660087344b257296a1412929, + type: 3} + propertyPath: isInsightPassthroughEnabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1664132754732668553, guid: 3142c30d660087344b257296a1412929, type: 3} propertyPath: m_Name @@ -3269,11 +3391,41 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 7109129406789398314, guid: 3142c30d660087344b257296a1412929, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8443327144756293032, guid: 3142c30d660087344b257296a1412929, type: 3} propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 8443327144756293032, guid: 3142c30d660087344b257296a1412929, + type: 3} + propertyPath: m_ClearFlags + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8443327144756293032, guid: 3142c30d660087344b257296a1412929, + type: 3} + propertyPath: m_BackGroundColor.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8443327144756293032, guid: 3142c30d660087344b257296a1412929, + type: 3} + propertyPath: m_BackGroundColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8443327144756293032, guid: 3142c30d660087344b257296a1412929, + type: 3} + propertyPath: m_BackGroundColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8443327144756293032, guid: 3142c30d660087344b257296a1412929, + type: 3} + propertyPath: m_BackGroundColor.r + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8443327144756293032, guid: 3142c30d660087344b257296a1412929, type: 3} propertyPath: m_CullingMask.m_Bits @@ -3299,7 +3451,8 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7109129406789398314, guid: 3142c30d660087344b257296a1412929, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 7681181393728380462, guid: 3142c30d660087344b257296a1412929, @@ -7214,7 +7367,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1123328223} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -10878,6 +11031,7 @@ MonoBehaviour: recorder: {fileID: 2089505615} loadingScreen: {fileID: 1815111294} canvas: {fileID: 304632835} + passthroughLayer: {fileID: 464406823} --- !u!1 &1663766863 GameObject: m_ObjectHideFlags: 0 @@ -11657,7 +11811,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1797910565 MonoBehaviour: @@ -11679,7 +11833,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: Willkommen m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -11713,7 +11867,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 1024 m_textAlignment: 65535 m_characterSpacing: 0 @@ -11992,6 +12146,7 @@ GameObject: - component: {fileID: 1815111295} - component: {fileID: 1815111297} - component: {fileID: 1815111296} + - component: {fileID: 1815111298} m_Layer: 0 m_Name: LoadingScreen m_TagString: Untagged @@ -12067,6 +12222,72 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1815111294} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1815111298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815111294} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 555725d48e9051a4bb6b8d45178c2fdd, type: 3} + m_Name: + m_EditorClassIdentifier: + projectionSurfaceType: 0 + overlayType: 2 + compositionDepth: 0 + hidden: 0 + overridePerLayerColorScaleAndOffset: 0 + colorScale: {x: 1, y: 1, z: 1, w: 1} + colorOffset: {x: 0, y: 0, z: 0, w: 0} + passthroughLayerResumed: + m_PersistentCalls: + m_Calls: [] + colorMapEditorType_: 0 + colorMapEditorGradient: + serializedVersion: 2 + key0: {r: 0, g: 0, b: 0, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + colorMapEditorContrast: 0 + colorMapEditorBrightness: 0 + colorMapEditorPosterize: 0 + colorMapEditorSaturation: 0 + _colorLutSourceTexture: {fileID: 0} + _colorLutTargetTexture: {fileID: 0} + _lutWeight: 1 + _flipLutY: 1 + serializedSurfaceGeometry: [] + textureOpacity_: 1 + edgeRenderingEnabled_: 0 + edgeColor_: {r: 1, g: 1, b: 1, a: 1} + colorMapType: 0 --- !u!1 &1843636611 GameObject: m_ObjectHideFlags: 0 @@ -13506,3 +13727,4 @@ SceneRoots: - {fileID: 656166928} - {fileID: 99310526} - {fileID: 304632833} + - {fileID: 464406826} diff --git a/Assets/_Scripts/Utility/FlushAndLoad.cs b/Assets/_Scripts/Utility/FlushAndLoad.cs index 23a2b38..2e1692b 100644 --- a/Assets/_Scripts/Utility/FlushAndLoad.cs +++ b/Assets/_Scripts/Utility/FlushAndLoad.cs @@ -4,6 +4,8 @@ using UnityEngine.SceneManagement; using TMPro; using System.Collections.Generic; using UnityEngine.UI; +using Cysharp.Threading.Tasks; +using System.Threading.Tasks; public class FlushAndLoad : MonoBehaviour { @@ -12,6 +14,7 @@ public class FlushAndLoad : MonoBehaviour public GhostRecorderBatch recorder; public GameObject loadingScreen; public GameObject canvas; + public GameObject passthroughLayer; private string sceneId; @@ -42,11 +45,12 @@ public class FlushAndLoad : MonoBehaviour else { output.text = "Flush..."; - loadingScreen.SetActive(true); + _ = LoadScene(); + /*loadingScreen.SetActive(true); canvas.SetActive(false); recorder.Flush(); - GetComponent().NewRoom(); + GetComponent().NewRoom();*/ } } @@ -56,8 +60,10 @@ public class FlushAndLoad : MonoBehaviour { loadingScreen.SetActive(false); output.text = ""; - - + if (sceneId == "End") + { + output.text = "Durchlauf beendet."; + } } private void HandleSceneIdReady(string id, List doors) @@ -66,12 +72,26 @@ public class FlushAndLoad : MonoBehaviour if (id == "Room1") { loadingScreen.SetActive(false); + passthroughLayer.SetActive(false); } if (id == "End") { - output.text = "Durchlauf beendet."; instruction.text = "Drücke den rechten Trigger, um die Anwendung zu beenden."; canvas.SetActive(true); + passthroughLayer.SetActive(true); } } + + private async UniTask Loadingscreen() + { + loadingScreen.SetActive(true); + canvas.SetActive(false); + } + + private async UniTaskVoid LoadScene() + { + await Loadingscreen(); + recorder.Flush(); + GetComponent().NewRoom(); + } }