diff --git a/scripts/system/configWizard/public/index.html b/scripts/system/configWizard/public/index.html
index d503fed77a..ee2b908a76 100644
--- a/scripts/system/configWizard/public/index.html
+++ b/scripts/system/configWizard/public/index.html
@@ -12,11 +12,20 @@
html,
body {
background-color: transparent !important;
+ overflow: hidden !important; /* Hide scrollbars */
}
-
+
.theme--dark.v-application {
background-color: transparent !important;
}
+
+ .v-text-field input {
+ font-size: 1.3em;
+ }
+
+ .v-text-field label {
+ font-size: 1.3em;
+ }
diff --git a/scripts/system/configWizard/src/App.vue b/scripts/system/configWizard/src/App.vue
index d1f851dbbc..c9161c95cc 100644
--- a/scripts/system/configWizard/src/App.vue
+++ b/scripts/system/configWizard/src/App.vue
@@ -10,10 +10,6 @@
//
-->
-
-
@@ -25,7 +21,7 @@
diff --git a/scripts/system/onFirstRun.js b/scripts/system/onFirstRun.js
index 65c1d06ec5..deb5dee562 100644
--- a/scripts/system/onFirstRun.js
+++ b/scripts/system/onFirstRun.js
@@ -13,20 +13,66 @@
//
(function() { // BEGIN LOCAL_SCOPE
+ // Check to see if we should run this script or bail...
var SETTING_TO_CHECK = 'firstRun';
- var DEFAULT_DISPLAY_NAME = '';
-
+
if (!Settings.getValue(SETTING_TO_CHECK, false)) {
return;
}
- if (MyAvatar.displayName === '') {
- var selectedDisplayName = Window.prompt('Enter a display name.', MyAvatar.displayName);
+ // If this is our first run then proceed...
- if (selectedDisplayName === '') {
+ var configWizardEntityID;
+ var DEFAULT_DISPLAY_NAME = '';
+
+ if (!PlatformInfo.has3DHTML()) {
+ if (MyAvatar.displayName === '') {
+ var selectedDisplayName = Window.prompt('Enter a display name.', MyAvatar.displayName);
+ setDisplayName(selectedDisplayName);
+ }
+ } else {
+ configWizardEntityID = Entities.addEntity({
+ type: 'Web',
+ sourceUrl: Script.resolvePath("./configWizard/dist/index.html"),
+ maxFPS: 60,
+ dpi: 20,
+ useBackground: false,
+ grab: {
+ grabbable: false
+ },
+ position: Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0, z: -2.25 })),
+ rotation: MyAvatar.orientation,
+ dimensions: { x: 1.4, y: 0.75, z: 0 }
+ }, 'local');
+
+ Entities.webEventReceived.connect(onWebAppEventReceived);
+ }
+
+ function setDisplayName(displayName) {
+ if (displayName === '') {
MyAvatar.displayName = DEFAULT_DISPLAY_NAME;
} else {
- MyAvatar.displayName = selectedDisplayName;
+ MyAvatar.displayName = displayName;
}
}
+
+ function onWebAppEventReceived(sendingEntityID, event) {
+ if (sendingEntityID === configWizardEntityID) {
+ var eventJSON = JSON.parse(event);
+ if (eventJSON.command === "complete-wizard") {
+ Performance.setPerformancePreset(eventJSON.data.performancePreset);
+ Performance.setRefreshRateProfile(eventJSON.data.refreshRateProfile);
+ setDisplayName(eventJSON.data.displayName);
+ Entities.deleteEntity(configWizardEntityID);
+ Entities.webEventReceived.disconnect(onWebAppEventReceived);
+ }
+ }
+ }
+
+ Script.scriptEnding.connect(function () {
+ if (configWizardEntityID) {
+ Entities.deleteEntity(configWizardEntityID);
+ Entities.webEventReceived.disconnect(onWebAppEventReceived);
+ }
+ });
}());