From 06056b9531c57404d6c977139afac40d30ef5a8a Mon Sep 17 00:00:00 2001 From: milad Date: Fri, 17 May 2019 13:00:26 -0700 Subject: [PATCH] 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);