diff --git a/Assets/Scenes/WACVR.unity b/Assets/Scenes/WACVR.unity index 0b2ca5a..89e3744 100644 --- a/Assets/Scenes/WACVR.unity +++ b/Assets/Scenes/WACVR.unity @@ -10971,6 +10971,7 @@ GameObject: - component: {fileID: 1483037936} - component: {fileID: 1483037935} - component: {fileID: 1483037933} + - component: {fileID: 1483037940} m_Layer: 5 m_Name: ConfigCanvas m_TagString: Untagged @@ -11063,7 +11064,7 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 - m_Camera: {fileID: 1326126835} + m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -11100,6 +11101,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 2.355} m_SizeDelta: {x: 1000, y: 400} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1483037940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1483037931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0fc2745f4c51ef9468462c96bf5c5d85, type: 3} + m_Name: + m_EditorClassIdentifier: + Camera: {fileID: 1326126835} --- !u!1 &1494369262 GameObject: m_ObjectHideFlags: 0 @@ -11788,6 +11802,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 1 + - m_Target: {fileID: 1483037940} + m_TargetAssemblyTypeName: CanvasCameraSwitcher, Essential + m_MethodName: EnableCanvasCamera + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_IsOn: 0 --- !u!1 &1552178587 stripped GameObject: diff --git a/Assets/Script/Configuration/SkyboxSwitcher.cs b/Assets/Script/Configuration/SkyboxSwitcher.cs index 03367c6..808960b 100644 --- a/Assets/Script/Configuration/SkyboxSwitcher.cs +++ b/Assets/Script/Configuration/SkyboxSwitcher.cs @@ -36,11 +36,11 @@ public class SkyboxSwitcher : MonoBehaviour Dropdown.onValueChanged.AddListener((int value) => { // add listener to dropdown if (value == 0) // if the first option is selected, disable the room { - Room.SetActive(true); + //Room.SetActive(true); } else // otherwise, enable the room and set the skybox { - Room.SetActive(false); + //Room.SetActive(false); currentSkyboxIndex = Dropdown.value; SetSkybox(); } diff --git a/Assets/Script/Essential/CanvasCameraSwitcher.cs b/Assets/Script/Essential/CanvasCameraSwitcher.cs new file mode 100644 index 0000000..8179a30 --- /dev/null +++ b/Assets/Script/Essential/CanvasCameraSwitcher.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(Canvas))] +public class CanvasCameraSwitcher : MonoBehaviour +{ + public Camera Camera; + private Canvas Canvas; + void Start() + { + Canvas = GetComponent(); + } + + public void EnableCanvasCamera(bool value) + { + if (value) + { + Canvas.worldCamera = Camera; + } + else + { + Canvas.worldCamera = null; + } + } +} diff --git a/Assets/Script/Essential/CanvasCameraSwitcher.cs.meta b/Assets/Script/Essential/CanvasCameraSwitcher.cs.meta new file mode 100644 index 0000000..19e6b75 --- /dev/null +++ b/Assets/Script/Essential/CanvasCameraSwitcher.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0fc2745f4c51ef9468462c96bf5c5d85 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: