diff --git a/app/src/components/EscapeMenu.vue b/app/src/components/EscapeMenu.vue new file mode 100644 index 00000000..4218ca02 --- /dev/null +++ b/app/src/components/EscapeMenu.vue @@ -0,0 +1,42 @@ + + + + + close + + + + VR Menu + + + Återuppta + Lämna VR miljö + + + + Esc to close + + + + + + + \ No newline at end of file diff --git a/app/src/components/lobby/VrAFrame.vue b/app/src/components/lobby/VrAFrame.vue index b7072914..718bc82c 100644 --- a/app/src/components/lobby/VrAFrame.vue +++ b/app/src/components/lobby/VrAFrame.vue @@ -50,8 +50,8 @@ :nipple-controls="`enabled: ${isTouchDevice};mode: static; rotationSensitivity: 2.0; bottomMargin: 70px; sideMargin: 30px;`"> @@ -185,6 +185,7 @@ import { usePointerLock } from '@vueuse/core'; import { overlayGUILeft, overlayGUIRight, leftHandVRGui, rightHandVRGui, cameraAttacher } from '@/composables/teleportTargets'; import AvatarHand from '@/components/entities/AvatarHand.vue'; import PlacedObject from '@/components/entities/PlacedObject.vue'; +import { is } from 'date-fns/locale'; const { currentCursorIntersection, triggerCursorClick, isCursorOnNavmesh, currentRaycastSelectorString, pointerOnHover } = useCurrentCursorIntersection(); const { lock, unlock, element } = usePointerLock(); @@ -220,6 +221,7 @@ const props = defineProps({ // navmeshUrl: {type: String, default: ''}, // showNavMesh: { type: Boolean, default: false }, // modelScale: {type: Number, default: 1}, + isMenuOpen: { type: Boolean, default: false }, }); const worldModelLoaded = ref(false); diff --git a/app/src/views/user/VrSpaceSceneView.vue b/app/src/views/user/VrSpaceSceneView.vue index 74aebeef..b705cbd2 100644 --- a/app/src/views/user/VrSpaceSceneView.vue +++ b/app/src/views/user/VrSpaceSceneView.vue @@ -2,19 +2,30 @@ + + - + @@ -58,6 +69,7 @@
Esc to close