Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 04:43:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15580 from MiladNazeri/simplifiedUINametag

Browse source 
changed size of always on overlays to be smaller
This commit is contained in:
Brad Hefta-Gaub 2019-05-17 14:42:29 -07:00 committed by GitHub
commit 4e86948c25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
scripts/system/simplifiedNametag/resources/modules/defaultLocalEntityProps.js → scripts/system/simplifiedUI/simplifiedNametag/resources/modules/defaultLocalEntityProps.js
View file

0
scripts/system/simplifiedNametag/resources/modules/entityMaker.js → scripts/system/simplifiedUI/simplifiedNametag/resources/modules/entityMaker.js
View file

11
scripts/system/simplifiedNametag/resources/modules/nameTagListManager.js → scripts/system/simplifiedUI/simplifiedNametag/resources/modules/nameTagListManager.js
View file

@ -10,7 +10,6 @@
// Helps manage the list of avatars added to the nametag list // Helps manage the list of avatars added to the nametag list
// //
var ON = 'ON'; var ON = 'ON';
var OFF = 'OFF'; var OFF = 'OFF';
var DEBUG_ON = true; var DEBUG_ON = true;
@ -63,7 +62,7 @@ function maybeClearInterval() {
var Z_SIZE = 0.01; var Z_SIZE = 0.01;
var LINE_HEIGHT_SCALER = 0.99; var LINE_HEIGHT_SCALER = 0.99;
var DISTANCE_SCALER_ON = 0.35; var DISTANCE_SCALER_ON = 0.35;
var DISTANCE_SCALER_ALWAYS_ON = 0.65; var DISTANCE_SCALER_ALWAYS_ON = 0.45;
var distanceScaler = DISTANCE_SCALER_ON; var distanceScaler = DISTANCE_SCALER_ON;
var userScaler = 1.0; var userScaler = 1.0;
var DEFAULT_LINE_HEIGHT = entityProps.lineHeight; var DEFAULT_LINE_HEIGHT = entityProps.lineHeight;
@ -251,11 +250,11 @@ var RIGHT_MARGIN_SCALER = 0.10;
var TOP_MARGIN_SCALER = 0.07; var TOP_MARGIN_SCALER = 0.07;
var BOTTOM_MARGIN_SCALER = 0.03; var BOTTOM_MARGIN_SCALER = 0.03;
var ABOVE_HEAD_OFFSET = 0.30; var ABOVE_HEAD_OFFSET = 0.30;
var DISTANCE_SCALER_INTERPOLATION_OFFSET_ALWAYSON = 25; var DISTANCE_SCALER_INTERPOLATION_OFFSET_ALWAYSON = 15;
var DISTANCE_SCALER_INTERPOLATION_OFFSET_ON = 10; var DISTANCE_SCALER_INTERPOLATION_OFFSET_ON = 10;
var maxDistance = MAX_RADIUS_IGNORE_METERS; var maxDistance = MAX_RADIUS_IGNORE_METERS;
var onModeScalar = 0.60; var onModeScalar = 0.55;
var alwaysOnModeScalar = -0.55; var alwaysOnModeScalar = -0.75;
function makeNameTag(uuid) { function makeNameTag(uuid) {
var avatar = _this.avatars[uuid]; var avatar = _this.avatars[uuid];
var avatarInfo = avatar.avatarInfo; var avatarInfo = avatar.avatarInfo;
@ -334,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. // 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_RADIUS_IGNORE_METERS = 22;
var MAX_ON_MODE_DISTANCE = 30; var MAX_ON_MODE_DISTANCE = 35;
var CHECK_AVATAR = true; var CHECK_AVATAR = true;
var MIN_DISTANCE = 0.2; var MIN_DISTANCE = 0.2;
function maybeRedraw(uuid) { function maybeRedraw(uuid) {

0
scripts/system/simplifiedNametag/resources/modules/objectAssign.js → scripts/system/simplifiedUI/simplifiedNametag/resources/modules/objectAssign.js
View file

0
scripts/system/simplifiedNametag/resources/modules/pickRayController.js → scripts/system/simplifiedUI/simplifiedNametag/resources/modules/pickRayController.js
View file

0
scripts/system/simplifiedNametag/resources/modules/textHelper.js → scripts/system/simplifiedUI/simplifiedNametag/resources/modules/textHelper.js
View file

1
scripts/system/simplifiedNametag/simplifiedNametag.js → scripts/system/simplifiedUI/simplifiedNametag/simplifiedNametag.js
View file

@ -8,7 +8,6 @@
// //
// Click on someone to get a nametag for them // Click on someone to get a nametag for them
// //
var PickRayController = Script.require('./resources/modules/pickRayController.js?' + Date.now()); var PickRayController = Script.require('./resources/modules/pickRayController.js?' + Date.now());
var NameTagListManager = Script.require('./resources/modules/nameTagListManager.js?' + Date.now()); var NameTagListManager = Script.require('./resources/modules/nameTagListManager.js?' + Date.now());
var pickRayController = new PickRayController(); var pickRayController = new PickRayController();

3
scripts/system/simplifiedUI/simplifiedUI.js
View file

@ -435,8 +435,7 @@ function ensureFirstPersonCameraInHMD(isHMDMode) {
} }
} }
var simplifiedNametag = Script.require("./simplifiedNametag/simplifiedNametag.js");
var simplifiedNametag = Script.require("../simplifiedNametag/simplifiedNametag.js");
var oldShowAudioTools; var oldShowAudioTools;
var oldShowBubbleTools; var oldShowBubbleTools;
var keepExistingUIAndScriptsSetting = Settings.getValue("simplifiedUI/keepExistingUIAndScripts", false); var keepExistingUIAndScriptsSetting = Settings.getValue("simplifiedUI/keepExistingUIAndScripts", false);