From d279ae1e09c2f0b63231bd841a7e76089a20ab19 Mon Sep 17 00:00:00 2001 From: marcgauch <34353267+marcgauch@users.noreply.github.com> Date: Thu, 11 Jan 2024 20:46:32 +0100 Subject: [PATCH] Proper passthroug and hidden anchors --- .../Ceiling Variant.prefab | 4 + .../Floor Variant.prefab | 4 + .../Shelf Variant.prefab | 4 + .../Wall Variant.prefab | 4 + .../Window/Window Variant.prefab | 4 + Assets/Scenes/Afterlife.unity | 137 +++++++++++++++++- Assets/Scenes/MyWorld.unity | 6 +- ProjectSettings/ProjectSettings.asset | 2 - 8 files changed, 161 insertions(+), 4 deletions(-) diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Ceiling Variant.prefab b/Assets/Prefabs/OVR Scene Manager Overrides/Ceiling Variant.prefab index 05aea3e..50769f3 100644 --- a/Assets/Prefabs/OVR Scene Manager Overrides/Ceiling Variant.prefab +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Ceiling Variant.prefab @@ -48,6 +48,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3396977722360074992, guid: 3ecf103c2a191704eb3046d6765665ed, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4350422998566360405, guid: 3ecf103c2a191704eb3046d6765665ed, type: 3} propertyPath: m_Name value: Ceiling Variant diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Floor Variant.prefab b/Assets/Prefabs/OVR Scene Manager Overrides/Floor Variant.prefab index c0353c9..710c0d3 100644 --- a/Assets/Prefabs/OVR Scene Manager Overrides/Floor Variant.prefab +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Floor Variant.prefab @@ -101,6 +101,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3396977722360074992, guid: 3ecf103c2a191704eb3046d6765665ed, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4350422998566360405, guid: 3ecf103c2a191704eb3046d6765665ed, type: 3} propertyPath: m_Name value: Floor Variant diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Shelf Variant.prefab b/Assets/Prefabs/OVR Scene Manager Overrides/Shelf Variant.prefab index c1f6788..2768526 100644 --- a/Assets/Prefabs/OVR Scene Manager Overrides/Shelf Variant.prefab +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Shelf Variant.prefab @@ -56,6 +56,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6073493186641658868, guid: 891349029806e4144812ff2d304d9cf9, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8999845180316542267, guid: 891349029806e4144812ff2d304d9cf9, type: 3} propertyPath: m_Name value: Shelf Variant diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Wall Variant.prefab b/Assets/Prefabs/OVR Scene Manager Overrides/Wall Variant.prefab index 7f8e786..9816861 100644 --- a/Assets/Prefabs/OVR Scene Manager Overrides/Wall Variant.prefab +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Wall Variant.prefab @@ -48,6 +48,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3396977722360074992, guid: 3ecf103c2a191704eb3046d6765665ed, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4350422998566360405, guid: 3ecf103c2a191704eb3046d6765665ed, type: 3} propertyPath: m_Name value: Wall Variant diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Window/Window Variant.prefab b/Assets/Prefabs/OVR Scene Manager Overrides/Window/Window Variant.prefab index 4c34104..f922e97 100644 --- a/Assets/Prefabs/OVR Scene Manager Overrides/Window/Window Variant.prefab +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Window/Window Variant.prefab @@ -52,6 +52,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6073493186641658868, guid: 891349029806e4144812ff2d304d9cf9, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7364228411325162552, guid: 891349029806e4144812ff2d304d9cf9, type: 3} propertyPath: m_LocalScale.z value: 0.05 diff --git a/Assets/Scenes/Afterlife.unity b/Assets/Scenes/Afterlife.unity index fd12953..3c38ce7 100644 --- a/Assets/Scenes/Afterlife.unity +++ b/Assets/Scenes/Afterlife.unity @@ -423,6 +423,70 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2037080, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_ClearFlags + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2037080, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_BackGroundColor.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2037080, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_BackGroundColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2037080, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_BackGroundColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2037080, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_BackGroundColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11400000, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: _trackingOriginType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11400000, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: isInsightPassthroughEnabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 20000010189485334, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_ClearFlags + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 20000010189485334, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_BackGroundColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20000010189485334, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_BackGroundColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20000010189485334, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_BackGroundColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20000012175207052, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_ClearFlags + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 20000012175207052, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_BackGroundColor.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20000012175207052, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_BackGroundColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20000012175207052, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_BackGroundColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20000012175207052, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_BackGroundColor.r + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -438,7 +502,10 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 487254, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} insertIndex: -1 addedObject: {fileID: 488502948} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + insertIndex: -1 + addedObject: {fileID: 922082570} m_SourcePrefab: {fileID: 100100000, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} --- !u!4 &922082565 stripped Transform: @@ -460,6 +527,74 @@ Transform: m_CorrespondingSourceObject: {fileID: 400004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} m_PrefabInstance: {fileID: 922082564} m_PrefabAsset: {fileID: 0} +--- !u!1 &922082569 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + m_PrefabInstance: {fileID: 922082564} + m_PrefabAsset: {fileID: 0} +--- !u!114 &922082570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 922082569} + 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} + 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 &1191604752 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MyWorld.unity b/Assets/Scenes/MyWorld.unity index c79c829..321a9c9 100644 --- a/Assets/Scenes/MyWorld.unity +++ b/Assets/Scenes/MyWorld.unity @@ -1854,7 +1854,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2037080, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} propertyPath: m_ClearFlags - value: 1 + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2037080, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} + propertyPath: m_BackGroundColor.a + value: 0 objectReference: {fileID: 0} - target: {fileID: 2037080, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} propertyPath: m_BackGroundColor.b diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index eefee64..75fdc46 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -139,8 +139,6 @@ PlayerSettings: bundleVersion: 0.1 preloadedAssets: - {fileID: 11400000, guid: 29d72bf9f28086693968cedbdc8f08cd, type: 2} - - {fileID: 11400000, guid: 541751c4fa90967d68ef779a22ee43f3, type: 2} - - {fileID: -3127938587913570544, guid: 8eb28e39ec717d0799039f01965f0533, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1