From df098cab2f9b2152694159a8f44086150baa4d5d Mon Sep 17 00:00:00 2001 From: milad Date: Fri, 17 May 2019 12:36:03 -0700 Subject: [PATCH 1/3] changed size of always on overlays to be smaller --- .../resources/modules/defaultLocalEntityProps.js | 0 .../simplifiedNametag/resources/modules/entityMaker.js | 0 .../resources/modules/nameTagListManager.js | 7 +++---- .../simplifiedNametag/resources/modules/objectAssign.js | 0 .../resources/modules/pickRayController.js | 0 .../simplifiedNametag/resources/modules/textHelper.js | 0 .../simplifiedNametag/simplifiedNametag.js | 1 - 7 files changed, 3 insertions(+), 5 deletions(-) rename scripts/system/{ => simplifiedUI}/simplifiedNametag/resources/modules/defaultLocalEntityProps.js (100%) rename scripts/system/{ => simplifiedUI}/simplifiedNametag/resources/modules/entityMaker.js (100%) rename scripts/system/{ => simplifiedUI}/simplifiedNametag/resources/modules/nameTagListManager.js (99%) rename scripts/system/{ => simplifiedUI}/simplifiedNametag/resources/modules/objectAssign.js (100%) rename scripts/system/{ => simplifiedUI}/simplifiedNametag/resources/modules/pickRayController.js (100%) rename scripts/system/{ => simplifiedUI}/simplifiedNametag/resources/modules/textHelper.js (100%) rename scripts/system/{ => simplifiedUI}/simplifiedNametag/simplifiedNametag.js (99%) diff --git a/scripts/system/simplifiedNametag/resources/modules/defaultLocalEntityProps.js b/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/defaultLocalEntityProps.js similarity index 100% rename from scripts/system/simplifiedNametag/resources/modules/defaultLocalEntityProps.js rename to scripts/system/simplifiedUI/simplifiedNametag/resources/modules/defaultLocalEntityProps.js diff --git a/scripts/system/simplifiedNametag/resources/modules/entityMaker.js b/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/entityMaker.js similarity index 100% rename from scripts/system/simplifiedNametag/resources/modules/entityMaker.js rename to scripts/system/simplifiedUI/simplifiedNametag/resources/modules/entityMaker.js diff --git a/scripts/system/simplifiedNametag/resources/modules/nameTagListManager.js b/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/nameTagListManager.js similarity index 99% rename from scripts/system/simplifiedNametag/resources/modules/nameTagListManager.js rename to scripts/system/simplifiedUI/simplifiedNametag/resources/modules/nameTagListManager.js index 98f73456d6..d77bbcf1b5 100644 --- a/scripts/system/simplifiedNametag/resources/modules/nameTagListManager.js +++ b/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/nameTagListManager.js @@ -10,7 +10,6 @@ // Helps manage the list of avatars added to the nametag list // - var ON = 'ON'; var OFF = 'OFF'; var DEBUG_ON = true; @@ -63,7 +62,7 @@ function maybeClearInterval() { var Z_SIZE = 0.01; var LINE_HEIGHT_SCALER = 0.99; var DISTANCE_SCALER_ON = 0.35; -var DISTANCE_SCALER_ALWAYS_ON = 0.65; +var DISTANCE_SCALER_ALWAYS_ON = 0.50; var distanceScaler = DISTANCE_SCALER_ON; var userScaler = 1.0; var DEFAULT_LINE_HEIGHT = entityProps.lineHeight; @@ -251,10 +250,10 @@ var RIGHT_MARGIN_SCALER = 0.10; var TOP_MARGIN_SCALER = 0.07; var BOTTOM_MARGIN_SCALER = 0.03; var ABOVE_HEAD_OFFSET = 0.30; -var DISTANCE_SCALER_INTERPOLATION_OFFSET_ALWAYSON = 25; +var DISTANCE_SCALER_INTERPOLATION_OFFSET_ALWAYSON = 5; var DISTANCE_SCALER_INTERPOLATION_OFFSET_ON = 10; var maxDistance = MAX_RADIUS_IGNORE_METERS; -var onModeScalar = 0.60; +var onModeScalar = 0.55; var alwaysOnModeScalar = -0.55; function makeNameTag(uuid) { var avatar = _this.avatars[uuid]; diff --git a/scripts/system/simplifiedNametag/resources/modules/objectAssign.js b/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/objectAssign.js similarity index 100% rename from scripts/system/simplifiedNametag/resources/modules/objectAssign.js rename to scripts/system/simplifiedUI/simplifiedNametag/resources/modules/objectAssign.js diff --git a/scripts/system/simplifiedNametag/resources/modules/pickRayController.js b/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/pickRayController.js similarity index 100% rename from scripts/system/simplifiedNametag/resources/modules/pickRayController.js rename to scripts/system/simplifiedUI/simplifiedNametag/resources/modules/pickRayController.js diff --git a/scripts/system/simplifiedNametag/resources/modules/textHelper.js b/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/textHelper.js similarity index 100% rename from scripts/system/simplifiedNametag/resources/modules/textHelper.js rename to scripts/system/simplifiedUI/simplifiedNametag/resources/modules/textHelper.js diff --git a/scripts/system/simplifiedNametag/simplifiedNametag.js b/scripts/system/simplifiedUI/simplifiedNametag/simplifiedNametag.js similarity index 99% rename from scripts/system/simplifiedNametag/simplifiedNametag.js rename to scripts/system/simplifiedUI/simplifiedNametag/simplifiedNametag.js index 75379f4e02..9b4d9cfad3 100644 --- a/scripts/system/simplifiedNametag/simplifiedNametag.js +++ b/scripts/system/simplifiedUI/simplifiedNametag/simplifiedNametag.js @@ -8,7 +8,6 @@ // // Click on someone to get a nametag for them // - var PickRayController = Script.require('./resources/modules/pickRayController.js?' + Date.now()); var NameTagListManager = Script.require('./resources/modules/nameTagListManager.js?' + Date.now()); var pickRayController = new PickRayController(); From 06056b9531c57404d6c977139afac40d30ef5a8a Mon Sep 17 00:00:00 2001 From: milad Date: Fri, 17 May 2019 13:00:26 -0700 Subject: [PATCH 2/3] updated location in main UI --- .../resources/modules/nameTagListManager.js | 6 +++--- scripts/system/simplifiedUI/simplifiedUI.js | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/nameTagListManager.js b/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/nameTagListManager.js index d77bbcf1b5..9e8f6c734a 100644 --- a/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/nameTagListManager.js +++ b/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/nameTagListManager.js @@ -62,7 +62,7 @@ function maybeClearInterval() { var Z_SIZE = 0.01; var LINE_HEIGHT_SCALER = 0.99; var DISTANCE_SCALER_ON = 0.35; -var DISTANCE_SCALER_ALWAYS_ON = 0.50; +var DISTANCE_SCALER_ALWAYS_ON = 0.45; var distanceScaler = DISTANCE_SCALER_ON; var userScaler = 1.0; var DEFAULT_LINE_HEIGHT = entityProps.lineHeight; @@ -250,11 +250,11 @@ var RIGHT_MARGIN_SCALER = 0.10; var TOP_MARGIN_SCALER = 0.07; var BOTTOM_MARGIN_SCALER = 0.03; var ABOVE_HEAD_OFFSET = 0.30; -var DISTANCE_SCALER_INTERPOLATION_OFFSET_ALWAYSON = 5; +var DISTANCE_SCALER_INTERPOLATION_OFFSET_ALWAYSON = 15; var DISTANCE_SCALER_INTERPOLATION_OFFSET_ON = 10; var maxDistance = MAX_RADIUS_IGNORE_METERS; var onModeScalar = 0.55; -var alwaysOnModeScalar = -0.55; +var alwaysOnModeScalar = -0.75; function makeNameTag(uuid) { var avatar = _this.avatars[uuid]; var avatarInfo = avatar.avatarInfo; diff --git a/scripts/system/simplifiedUI/simplifiedUI.js b/scripts/system/simplifiedUI/simplifiedUI.js index c6181d2ad9..b69a1d48b2 100644 --- a/scripts/system/simplifiedUI/simplifiedUI.js +++ b/scripts/system/simplifiedUI/simplifiedUI.js @@ -434,8 +434,7 @@ function ensureFirstPersonCameraInHMD(isHMDMode) { } } - -var simplifiedNametag = Script.require("../simplifiedNametag/simplifiedNametag.js"); +var simplifiedNametag = Script.require("./simplifiedNametag/simplifiedNametag.js"); var oldShowAudioTools; var oldShowBubbleTools; var keepExistingUIAndScriptsSetting = Settings.getValue("simplifiedUI/keepExistingUIAndScripts", false); From 0d80761cf00569364bd4154aa7f67363bd852e1f Mon Sep 17 00:00:00 2001 From: milad Date: Fri, 17 May 2019 13:23:03 -0700 Subject: [PATCH 3/3] added larger distance for on --- .../simplifiedNametag/resources/modules/nameTagListManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/nameTagListManager.js b/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/nameTagListManager.js index 9e8f6c734a..ded67745f8 100644 --- a/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/nameTagListManager.js +++ b/scripts/system/simplifiedUI/simplifiedNametag/resources/modules/nameTagListManager.js @@ -333,7 +333,7 @@ function makeNameTag(uuid) { // Check to see if the display named changed or if the distance is big enough to need a redraw. var MAX_RADIUS_IGNORE_METERS = 22; -var MAX_ON_MODE_DISTANCE = 30; +var MAX_ON_MODE_DISTANCE = 35; var CHECK_AVATAR = true; var MIN_DISTANCE = 0.2; function maybeRedraw(uuid) {