From a474307fc84c865ad80ce726c9b9613d4a500096 Mon Sep 17 00:00:00 2001
From: mhby1g21 <mhby1g21@soton.ac.uk>
Date: Wed, 15 Jan 2025 21:22:58 +0000
Subject: [PATCH] added KT LIDAR VR to dropdown, v2.4 released
---
AVVR/Assets/Scenes/MenuInterface.unity | 4 +-
.../KT_lidar_VR.unity | 37 +++++++++++++------
AVVR/Assets/_Scripts/LoadScene.cs | 1 +
.../ProjectSettings/EditorBuildSettings.asset | 3 ++
AVVR/ProjectSettings/ProjectSettings.asset | 4 +-
5 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/AVVR/Assets/Scenes/MenuInterface.unity b/AVVR/Assets/Scenes/MenuInterface.unity
index c79311b..5de8373 100644
--- a/AVVR/Assets/Scenes/MenuInterface.unity
+++ b/AVVR/Assets/Scenes/MenuInterface.unity
@@ -3073,7 +3073,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: Kitchen (VR)
+ m_text: Kitchen LIDAR (VR)
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -5238,6 +5238,8 @@ MonoBehaviour:
m_Value: 0
m_Options:
m_Options:
+ - m_Text: Kitchen LIDAR (VR)
+ m_Image: {fileID: 0}
- m_Text: Kitchen (VR)
m_Image: {fileID: 0}
- m_Text: Kitchen (no VR)
diff --git a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/KT_lidar_VR.unity b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/KT_lidar_VR.unity
index 51d29a3..0b26fd9 100644
--- a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/KT_lidar_VR.unity
+++ b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/KT_lidar_VR.unity
@@ -135,14 +135,14 @@ Material:
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- - _ALPHABLEND_ON
- - _EMISSION
+ - _ALPHAPREMULTIPLY_ON
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2999
- stringTagMap: {}
+ stringTagMap:
+ RenderType: Transparent
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
@@ -198,9 +198,9 @@ Material:
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- - _SrcBlend: 5
+ - _SrcBlend: 1
- _UVSec: 0
- - _ZWrite: 1
+ - _ZWrite: 0
m_Colors:
- _Color: {r: 0.2980388, g: 0.29019582, b: 0.3725488, a: 0.929}
- _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1}
@@ -1550,7 +1550,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 660351706}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@@ -1989,11 +1989,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 946cf94c3e1c9254ab54e219cf92f931, type: 3}
m_Name:
m_EditorClassIdentifier:
- dimensions: {x: 5.6800003, y: 2.960001, z: 8.72}
- volume: 146.60768
- width: 5.6800003
- height: 2.960001
- depth: 8.72
+ dimensions: {x: 0, y: 0, z: 0}
+ volume: 0
+ width: 0
+ height: 0
+ depth: 0
--- !u!23 &881261930
MeshRenderer:
m_ObjectHideFlags: 0
@@ -3622,6 +3622,14 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 2415663707143897437, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3}
+ propertyPath: roomWrapper
+ value:
+ objectReference: {fileID: 1753572071}
+ - target: {fileID: 2415663707143897437, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3}
+ propertyPath: interactableAudioSource
+ value:
+ objectReference: {fileID: 1879206325}
- target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@@ -3995,7 +4003,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!114 &1753572071
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4182,6 +4190,11 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e8704b2cb89ef5f4c900ad41600ea441, type: 3}
+--- !u!82 &1879206325 stripped
+AudioSource:
+ m_CorrespondingSourceObject: {fileID: 4871191154425633360, guid: e8704b2cb89ef5f4c900ad41600ea441, type: 3}
+ m_PrefabInstance: {fileID: 1879206324}
+ m_PrefabAsset: {fileID: 0}
--- !u!43 &1903483313
Mesh:
m_ObjectHideFlags: 0
diff --git a/AVVR/Assets/_Scripts/LoadScene.cs b/AVVR/Assets/_Scripts/LoadScene.cs
index 43f04ac..178d565 100644
--- a/AVVR/Assets/_Scripts/LoadScene.cs
+++ b/AVVR/Assets/_Scripts/LoadScene.cs
@@ -9,6 +9,7 @@ public class LoadButton : MonoBehaviour
private Dictionary<string, string> sceneMapping = new Dictionary<string, string>()
{
+ {"Kitchen LIDAR (VR)", "KT_lidar_VR"},
{"Kitchen (no VR)", "KT_NoVR"},
{"Kitchen (VR)", "KT_demo"},
{"Meeting Room (no VR)", "MR_NoVR"},
diff --git a/AVVR/ProjectSettings/EditorBuildSettings.asset b/AVVR/ProjectSettings/EditorBuildSettings.asset
index f1a3ce2..c0701a2 100644
--- a/AVVR/ProjectSettings/EditorBuildSettings.asset
+++ b/AVVR/ProjectSettings/EditorBuildSettings.asset
@@ -44,6 +44,9 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/UL_NoVR.unity
guid: 45e58e66a2eec8745a98e118b83382f9
+ - enabled: 1
+ path: Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/KT_lidar_VR.unity
+ guid: 3015dfe084d6255458f5264cc7a9b20d
m_configObjects:
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2}
Unity.XR.WindowsMR.Settings: {fileID: 11400000, guid: dc5a169419fa04987b057f65238cf3ba, type: 2}
diff --git a/AVVR/ProjectSettings/ProjectSettings.asset b/AVVR/ProjectSettings/ProjectSettings.asset
index 84dd7fa..a256b9a 100644
--- a/AVVR/ProjectSettings/ProjectSettings.asset
+++ b/AVVR/ProjectSettings/ProjectSettings.asset
@@ -136,7 +136,9 @@ PlayerSettings:
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
bundleVersion: 0.1
- preloadedAssets: []
+ preloadedAssets:
+ - {fileID: -6517218471499782410, guid: 1a4c68ca72a83449f938d669337cb305, type: 2}
+ - {fileID: -3160651408743164439, guid: a9a6963505ddf7f4d886008c6dc86122, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
--
GitLab