+
+
+
+
+
diff --git a/src/components/JitsiContainer.vue b/src/components/JitsiContainer.vue
new file mode 100644
index 00000000..8b934bdb
--- /dev/null
+++ b/src/components/JitsiContainer.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/LoadingScreen.vue b/src/components/LoadingScreen.vue
new file mode 100644
index 00000000..592f5393
--- /dev/null
+++ b/src/components/LoadingScreen.vue
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/MainScene.vue b/src/components/MainScene.vue
index aa94c996..d393cd29 100644
--- a/src/components/MainScene.vue
+++ b/src/components/MainScene.vue
@@ -1,110 +1,288 @@
-
-
-
-
-
-
+ ![]()
+
+
+
+
+
+ {{ applicationStore.renderer.fps.toFixed(0) }} FPS
+ {{ applicationStore.theme.versionWatermark }}
+
+
+ Domains
+
+
+
+ You must be logged in to view and manage your domains.
+
+
+
+
+
+
+
+
+
+ {{ props.row.users }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ props.row.name }}
+ ID: {{ props.row.domainID }}
+ {{ props.row.version || '-' }}
+ {{ props.row.protocol || '' }}
+ Domain Token
+
+
+ Domain
+ {{ tokenDialog.domain?.name }} ({{ tokenDialog.domain?.domainID }})
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/components/login/MetaverseLogin.vue b/src/components/components/login/MetaverseLogin.vue
index 1a50b30f..54fcdbee 100644
--- a/src/components/components/login/MetaverseLogin.vue
+++ b/src/components/components/login/MetaverseLogin.vue
@@ -3,6 +3,7 @@
//
// Created by Kalila L. on May 18th, 2021.
// Copyright 2021 Vircadia contributors.
+// Copyright 2022 DigiSomni LLC.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -10,27 +11,30 @@
+
+
+ Azure AD is not configured. Please set VRCA_AZURE_* env vars.
+
+
+
+
+
+
-
+
-
+
-
diff --git a/src/components/overlays/avatar/Avatar.vue b/src/components/overlays/avatar/Avatar.vue
new file mode 100644
index 00000000..09273367
--- /dev/null
+++ b/src/components/overlays/avatar/Avatar.vue
@@ -0,0 +1,648 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ displayNameStore }}
+
+
+
+
+
+
+
+
+
+ {{ activeModelNameStore }}
+
+
+
+
+
+
+
+
+ New Avatar
+
+
+
+ My Avatars
+
+ Cancel
+ Ok
+
+
+
+
+
+
+
+
+
+
+ {{ avatar.avatar.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ You have no saved avatars.
++ {{ Object.entries(userStore.avatar.models).length > 0 ? 'Or c' : 'C' }}reate your own avatar with: +
+
-
-
-
- ![]()
- {{ msgSender(msg).charAt(0) }}
-
-
-
-
-
+
+ There are no meetings in this domain.
+ {{ msgSender(msg) }} : {{ msgText(msg) }}
+
+ {{ msgSender(msg) }} : {{ msgText(msg) }}
+
There are no messages to show.
DisplayName: {{ $store.state.avatar.displayName }}
- Location: {{ $store.state.avatar.location }}
+ DisplayName: {{ userStore.avatar.displayName }}
+ Location: {{ userStore.avatar.location }}
- Avatars: {{ $store.state.avatars.count }}
- {{ ava.stringify() }}
+ Avatars: {{ applicationStore.avatars.count }}
+ {{ ava }}
+ Colors:
+
+
+
+
+ Primary:
+
+
+ Secondary:
+
+
+ Accent:
+
+
-
-
-
-
-
+ ![]()
+
+
+
+
+
+ {{ parseLocation(getLocation, 'position').toString().replace('{', '').replace('}', '') }}
+
+
+
+ {{ parseLocation(getLocation, 'rotation').toString().replace('{', '').replace('}', '') }}
+
+
+
+
+
+ New Bookmark
+
+
+
+
+ Cancel
+ Ok
+
+
+
+
+
+
+
+
+
+
+ You have no bookmarks
+
+ Cancel
+ Ok
+
+
+ Reset position
+
+ Stuck?
+
+
+
+
+
+
+
+
+
+ There is no one else in this server.
+
+ This is taking longer than usual. Hang on...
+Loading avatar...
+Something went wrong. Please try again.
+ +
-
-
-
-
-
-
-
- Using {{ selectedInputStore }}
-
-
-
- No microphone selected.
-
-
-
-
-
-
- Please grant mic access to the app in order to speak.
-
-
-
-
-
-
- Using {{ selectedOutputStore }}
-
-
-
- No output selected.
-
-
-
-
-
-
+
+
+
+
+
+
+
+ Using {{ AudioIO.selectedInput }}
+
+
+
+ No microphone selected.
+
+
+
+
+
+
+ Please grant mic access to the app in order to speak.
+
+
+
+
+
+
+ Using {{ AudioIO.selectedOutput }}
+
+
+
+ No output selected.
+
+
+
+
+
+ Select a control to rebind it.
+Press ESC to cancel.
+Press any key...
+
+ {{ KeyboardSettings.formatKeyName(bind.keycode) }}
+
+
-
-
-
-
-
- {{ getLocation }}
-
-
- {{ getDomainServerState }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $store.state.account.isLoggedIn ? $store.state.account.username : "Guest" }}
-
-
- {{ $store.state.account.isLoggedIn ? "Logged in" : "Click to log in to metaverse" }}
-
-
-
-
-
-
-
-
-
- {{ menuItem.label }}
-
-
-
-
-
- {{ menuItem.label }}
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
- Help
-
-
-
-
- {{ menuItem.label }}
-
-
- Status
-
-
- Domain
- {{ getDomainServerState }}
-
-
-
-
- Metaverse
- {{ getMetaverseServerState }}
-
-
- About
-
-
- {{ $store.state.globalConsts.APP_NAME }}
- {{ $store.state.globalConsts.APP_VERSION_TAG }}
- Vircadia Web SDK
- {{ $store.state.globalConsts.SDK_VERSION_TAG }}
-
-
-
-
-
-
-
+
+
+
+
+ {{ domainServerState }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ userStore.account.isLoggedIn ? userStore.account.username : "Guest" }}
+
+
+ {{ userStore.account.isLoggedIn ?
+ "Logged in" :
+ `Click to log in to the ${applicationStore.theme.globalServiceTerm.toLowerCase()}.` }}
+
+
+
+
+
+
+
+
+
+ {{ menuItem.label }}
+
+
+
+
+
+ {{ menuItem.label }}
+
+ {{ formatMenuItemCaption(menuItem.caption) }}
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ Account
+
+
+
+
+
+
+
+ {{ userStore.account.isLoggedIn ? userStore.account.username : "Guest" }}
+
+
+ {{ userStore.account.isLoggedIn ?
+ "Logged in" :
+ `Click to log in to the ${applicationStore.theme.globalServiceTerm.toLowerCase()}.` }}
+
+
+
+ Settings
+
+
+ {{ menuItem.label }}
+
+
+
+
+
+ {{ menuItem.label }}
+
+
+
+
+ Help
+
+
+
+
+ {{ menuItem.label }}
+
+
+ Status
+
+
+ Domain
+ {{ domainServerState }}
+
+
+
+
+
+
+ {{ applicationStore.theme.globalServiceTerm }}
+ {{ metaverseServerState.toUpperCase() }}
+
+
+
+
+ About
+
+
+ {{ applicationStore.globalConsts.APP_NAME }}
+ {{ applicationStore.globalConsts.APP_VERSION_TAG }}
+
+
+
+
+ Vircadia Web SDK
+ {{ applicationStore.globalConsts.SDK_VERSION_TAG }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Please allow microphone access.
+
+
+
+
+ {{ applicationStore.renderer.contentIsLoading
+ && applicationStore.renderer.contentLoadingInfo
+ ? applicationStore.renderer.contentLoadingInfo : "Loading..." }}
+
+
+ + {{ `${applicationStore.renderer.contentLoadingSpeed.toFixed(1)}MB/s` }} +
++ {{ location }} +
++ {{ metaverseServerLocation }} +
+Domains
+