diff --git a/Assets/Discord.meta b/Assets/Discord.meta deleted file mode 100644 index ddd058cf..00000000 --- a/Assets/Discord.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a7b0622d814d3b47ead913d7e6179fc2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index e7bef630..29fdeadd 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -152,10 +152,10 @@ RectTransform: m_Father: {fileID: 200824074} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -634, y: -356} + m_SizeDelta: {x: 2000, y: 2000} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &36968831 MonoBehaviour: @@ -383,7 +383,7 @@ RectTransform: m_Children: - {fileID: 38435182} m_Father: {fileID: 1004284484} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -628,9 +628,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d7004eae70666346a4aad4643c7eb1b, type: 3} m_Name: m_EditorClassIdentifier: - optionsPanel: {fileID: 0} - settings: {fileID: 0} - quit: {fileID: 0} + mainPanel: {fileID: 1802993855} + optionsPanel: {fileID: 944486603} + closeDialog: {fileID: 778271258} + optionsButton: {fileID: 1379625973} + quitButton: {fileID: 145819188} --- !u!1 &358118042 GameObject: m_ObjectHideFlags: 0 @@ -854,6 +856,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 560674668} m_CullTransparentMesh: 0 +--- !u!1 &778271255 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 778271256} + - component: {fileID: 778271258} + - component: {fileID: 778271257} + m_Layer: 5 + m_Name: closePanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &778271256 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 778271255} + 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_Children: [] + m_Father: {fileID: 1004284484} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 330, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &778271257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 778271255} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.09019608} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &778271258 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 778271255} + m_CullTransparentMesh: 0 --- !u!1 &944486600 GameObject: m_ObjectHideFlags: 0 @@ -1020,8 +1096,9 @@ RectTransform: m_Children: - {fileID: 1802993853} - {fileID: 944486601} - - {fileID: 145819187} + - {fileID: 778271256} - {fileID: 1379625972} + - {fileID: 145819187} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1234,6 +1311,163 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1547084479 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1547084480} + - component: {fileID: 1547084482} + - component: {fileID: 1547084481} + m_Layer: 5 + m_Name: HWText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1547084480 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547084479} + 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_Children: [] + m_Father: {fileID: 1802993853} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100, y: -270} + m_SizeDelta: {x: 200, y: 610} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1547084481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547084479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_text: HandWaver + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_textAlignment: 257 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 1547084481} + characterCount: 9 + spriteCount: 0 + spaceCount: 0 + wordCount: 1 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1547084482 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547084479} + m_CullTransparentMesh: 0 --- !u!1 &1802993852 GameObject: m_ObjectHideFlags: 0 @@ -1262,14 +1496,15 @@ RectTransform: 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_Children: [] + m_Children: + - {fileID: 1547084480} m_Father: {fileID: 1004284484} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -275, y: 0} - m_SizeDelta: {x: -550, y: -100} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100, y: 0} + m_SizeDelta: {x: 200, y: -100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1802993854 MonoBehaviour: diff --git a/Assets/Scripts/EmbodiedInput/BodyInputDataSystem.cs b/Assets/Scripts/EmbodiedInput/BodyInputDataSystem.cs index 22515760..4afa652d 100644 --- a/Assets/Scripts/EmbodiedInput/BodyInputDataSystem.cs +++ b/Assets/Scripts/EmbodiedInput/BodyInputDataSystem.cs @@ -1,8 +1,8 @@ -#if LeapMotion using System.Collections.Generic; -using Leap.Unity; using Unity.Mathematics; using UnityEngine; +#if LeapMotion +using Leap.Unity; #endif #if ViveSense using ViveHandTracking; diff --git a/Assets/Scripts/Extended Scripts/SceneManagement.meta b/Assets/Scripts/Extended Scripts/SceneManagement.meta deleted file mode 100644 index e02ee38b..00000000 --- a/Assets/Scripts/Extended Scripts/SceneManagement.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 8b34265d8c1e08645a4d17dbcaf4fec6 -folderAsset: yes -timeCreated: 1496538249 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/SceneSpecific/menu/MenuTraversalManager.cs b/Assets/Scripts/SceneSpecific/menu/MenuTraversalManager.cs new file mode 100644 index 00000000..87e7634e --- /dev/null +++ b/Assets/Scripts/SceneSpecific/menu/MenuTraversalManager.cs @@ -0,0 +1,83 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +namespace IMRE.HandWaver.Menu +{ + + public class MenuTraversalManager : MonoBehaviour + { + public CanvasRenderer mainPanel; + public CanvasRenderer optionsPanel; + public CanvasRenderer closeDialog; + public Button optionsButton; + public Button quitButton; + + private bool isSettingsOpen => optionsPanel.gameObject.activeSelf; + private bool isCloseDialogOpen => closeDialog.gameObject.activeSelf; + + private void Start() + { + optionsButton.onClick.AddListener(toggleSettings); + quitButton.onClick.AddListener(toggleCloseDialog); + } + + + private void Update() + { + if (Input.GetKeyDown(KeyCode.Escape)) + { + if (isSettingsOpen) + { + toggleSettings(); + } + else + { + toggleCloseDialog(); + } + } + + } + + private void toggleCloseDialog() + { + if (isCloseDialogOpen) + { + optionsButton.gameObject.SetActive(true); + quitButton.gameObject.SetActive(true); + closeDialog.gameObject.SetActive(false); + mainPanel.gameObject.SetActive(true); + } + else + { + optionsButton.gameObject.SetActive(false); + quitButton.gameObject.SetActive(false); + closeDialog.gameObject.SetActive(true); + mainPanel.gameObject.SetActive(false); + + } + } + + private void toggleSettings() + { + if (isSettingsOpen) + { + optionsButton.gameObject.SetActive(true); + quitButton.gameObject.SetActive(true); + optionsPanel.gameObject.SetActive(false); + mainPanel.gameObject.SetActive(true); + + } + else + { + optionsButton.gameObject.SetActive(false); + quitButton.gameObject.SetActive(false); + optionsPanel.gameObject.SetActive(true); + mainPanel.gameObject.SetActive(false); + + } + } + + } +} \ No newline at end of file diff --git a/Assets/Scripts/SceneSpecific/menu/menuButtonManager.cs.meta b/Assets/Scripts/SceneSpecific/menu/MenuTraversalManager.cs.meta similarity index 100% rename from Assets/Scripts/SceneSpecific/menu/menuButtonManager.cs.meta rename to Assets/Scripts/SceneSpecific/menu/MenuTraversalManager.cs.meta diff --git a/Assets/Scripts/SceneSpecific/menu/menuButtonManager.cs b/Assets/Scripts/SceneSpecific/menu/menuButtonManager.cs deleted file mode 100644 index 47c7cba7..00000000 --- a/Assets/Scripts/SceneSpecific/menu/menuButtonManager.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -namespace IMRE.HandWaver.Menu -{ - - public class menuButtonManager : MonoBehaviour - { - public CanvasRenderer optionsPanel; - public Button settings; - public Button quit; - - - - - } -} \ No newline at end of file diff --git a/Assets/ViveHandTracking.meta b/Assets/ViveHandTracking.meta deleted file mode 100644 index bba3a4b0..00000000 --- a/Assets/ViveHandTracking.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: db7266785888d9543925c1db411cd897 -folderAsset: yes -timeCreated: 1525934427 -licenseType: Pro -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 20225777..a1b48fa8 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -515,7 +515,7 @@ PlayerSettings: webGLThreadsSupport: 0 webGLWasmStreaming: 0 scriptingDefineSymbols: - 1: ViveSense;LeapMotion + 1: 4: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER 7: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER 13: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER