Merge remote-tracking branch 'origin/master'

interface/resources/qml/controls/qmldir

@@ -0,0 +1,25 @@
+module controls
+Button 1.0 Button.qml
+ButtonAwesome 1.0 ButtonAwesome.qml
+CheckBox 1.0 CheckBox.qml
+ComboBox 1.0 ComboBox.qml
+FlickableWebViewCore 1.0 FlickableWebViewCore.qml
+FontAwesome 1.0 FontAwesome.qml
+Player 1.0 Player.qml
+RadioButton 1.0 RadioButton.qml
+Slider 1.0 Slider.qml
+Spacer 1.0 Spacer.qml
+SpinBox 1.0 SpinBox.qml
+TabletWebButton 1.0 TabletWebButton.qml
+TabletWebScreen 1.0 TabletWebScreen.qml
+TabletWebView 1.0 TabletWebView.qml
+Text 1.0 Text.qml
+TextAndSlider 1.0 TextAndSlider.qml
+TextAndSpinBox 1.0 TextAndSpinBox.qml
+TextArea 1.0 TextArea.qml
+TextEdit 1.0 TextEdit.qml
+TextField 1.0 TextField.qml
+TextHeader 1.0 TextHeader.qml
+TextInput 1.0 TextInput.qml
+TextInputAndButton 1.0 TextInputAndButton.qml
+WebView 1.0 WebView.qml

interface/resources/qml/hifi/dialogs/qmldir

@@ -0,0 +1,18 @@
+module dialogs
+AboutDialog 1.0 AboutDialog.qml
+AdvancedPreferencesDialog 1.0 AdvancedPreferencesDialog.qml
+AudioBuffers 1.0 AudioBuffers.qml
+AvatarPreferencesDialog 1.0 AvatarPreferencesDialog.qml
+GeneralPreferencesDialog 1.0 GeneralPreferencesDialog.qml
+LodPreferencesDialog 1.0 LodPreferencesDialog.qml
+ModelBrowserDialog 1.0 ModelBrowserDialog.qml
+NetworkingPreferencesDialog 1.0 NetworkingPreferencesDialog.qml
+RunningScripts 1.0 RunningScripts.qml
+TabletAboutDialog 1.0 TabletAboutDialog.qml
+TabletAssetServer 1.0 TabletAssetServer.qml
+TabletDCDialog 1.0 TabletDCDialog.qml
+TabletDebugWindow 1.0 TabletDebugWindow.qml
+TabletEntityStatistics 1.0 TabletEntityStatistics.qml
+TabletEntityStatisticsItem 1.0 TabletEntityStatisticsItem.qml
+TabletLODTools 1.0 TabletLODTools.qml
+TabletRunningScripts 1.0 TabletRunningScripts.qml

interface/resources/qml/hifi/toolbars/qmldir

@@ -0,0 +1,4 @@
+module toolbars
+StateImage 1.0 StateImage.qml
+Toolbar 1.0 Toolbar.qml
+ToolbarButton 1.0 ToolbarButton.qml

scripts/simplifiedUI/ui/simplifiedNametag/resources/modules/nameTagListManager.js

@@ -9,16 +9,17 @@
 //
 //  Helps manage the list of avatars added to the nametag list
 //
-
-var EntityMaker = Script.require('./entityMaker.js?' + Date.now());
-var entityProps = Script.require('./defaultLocalEntityProps.js?' + Date.now());
-var textHelper = new (Script.require('./textHelper.js?' + Date.now()));
+var EntityMaker = Script.require('./entityMaker.js');
+var entityProps = Script.require('./defaultLocalEntityProps.js');
+var textHelper = new (Script.require('./textHelper.js'));
 var X = 0;
 var Y = 1;
 var Z = 2;
 var HALF = 0.5;
 var CLEAR_ENTITY_EDIT_PROPS = true;
 var MILISECONDS_IN_SECOND = 1000;
+var SECONDS_IN_MINUTE = 60;
+var ALWAYS_ON_MAX_LIFETIME_IN_SECONDS = 20 * SECONDS_IN_MINUTE; // Delete after 20 minutes in case a nametag is hanging around in on mode 
 
 // *************************************
 // START UTILTY
@@ -58,8 +59,6 @@ var distanceScaler = DISTANCE_SCALER_ON;
 var userScaler = 1.0;
 var DEFAULT_LINE_HEIGHT = entityProps.lineHeight;
 function calculateInitialProperties(uuid) {
-    var avatar = _this.avatars[uuid];
-
     var adjustedScaler = null;
     var distance = null;
     var dimensions = null;
@@ -97,19 +96,6 @@ function calculateInitialProperties(uuid) {
 }
 
 
-// Used in alwaysOn mode to show or hide if they reached the max radius
-function showHide(uuid, type) {
-    var avatar = _this.avatars[uuid];
-    var nametag = avatar.nametag;
-
-    if (type === "show") {
-        nametag.show();
-    } else {
-        nametag.hide();
-    }
-}
-
-
 // Go through the selected avatar list and see if any of the avatars need a redraw
 function checkAllSelectedForRedraw() {
     for (var avatar in _this.selectedAvatars) {
@@ -168,6 +154,18 @@ function getDistance(uuid, checkAvatar, shouldSave) {
 }
 
 
+// Quick check for distance from avatar
+function quickDistanceCheckForNonSelectedAvatars(uuid) {
+    var source = MyAvatar.position;
+
+    var target = AvatarManager.getAvatar(uuid).position;
+
+    var avatarDistance = Vec3.distance(target, source);
+
+    return avatarDistance;
+}
+
+
 // Check to see if we need to toggle our interval check because we went to 0 avatars
 // or if we got our first avatar in the select list
 function shouldToggleInterval() {
@@ -197,7 +195,9 @@ function toggleInterval() {
 }
 
 
-// handle turning the peristenet mode on
+// Handle checking to see if we should add or delete nametags in persistent mode
+var alwaysOnAvatarDistanceCheck = false;
+var DISTANCE_CHECK_INTERVAL_MS = 1000;
 function handleAlwaysOnMode(shouldTurnOnAlwaysOnMode) {
     _this.reset();
     if (shouldTurnOnAlwaysOnMode) {
@@ -205,9 +205,23 @@ function handleAlwaysOnMode(shouldTurnOnAlwaysOnMode) {
             .getAvatarIdentifiers()
             .forEach(function (avatar) {
                 if (avatar) {
-                    add(avatar);
+                    var avatarDistance = quickDistanceCheckForNonSelectedAvatars(avatar);
+                    if (avatarDistance < MAX_RADIUS_IGNORE_METERS) {
+                        add(avatar);
+                    }
                 }
             });
+        maybeClearAlwaysOnAvatarDistanceCheck();
+        alwaysOnAvatarDistanceCheck = Script.setInterval(maybeAddOrRemoveIntervalCheck, DISTANCE_CHECK_INTERVAL_MS);
+    }
+}
+
+
+// Check to see if we need to clear the distance check in persistent mode
+function maybeClearAlwaysOnAvatarDistanceCheck() {
+    if (alwaysOnAvatarDistanceCheck) {
+        Script.clearInterval(alwaysOnAvatarDistanceCheck);
+        alwaysOnAvatarDistanceCheck = false;
     }
 }
 
@@ -313,12 +327,6 @@ function makeNameTag(uuid) {
     var nameTagPosition = jointInObjectFrame.y + scaledDimenionsYHalf + ABOVE_HEAD_OFFSET;
     var localPosition = [0, nameTagPosition, 0];
 
-    var visible = true;
-    if (avatarNametagMode === "alwaysOn") {
-        var currentDistance = getDistance(uuid, CHECK_AVATAR, false);
-        visible = currentDistance > MAX_RADIUS_IGNORE_METERS ? false : true;
-    }
-
     nametag
         .add("leftMargin", lineHeight * LEFT_MARGIN_SCALER)
         .add("rightMargin", lineHeight * RIGHT_MARGIN_SCALER)
@@ -328,7 +336,6 @@ function makeNameTag(uuid) {
         .add("dimensions", scaledDimensions)
         .add("parentID", parentID)
         .add("localPosition", localPosition)
-        .add("visible", visible)
         .create(CLEAR_ENTITY_EDIT_PROPS);
 
     Script.setTimeout(function () {
@@ -341,33 +348,45 @@ function makeNameTag(uuid) {
 var MAX_RADIUS_IGNORE_METERS = 22;
 var MAX_ON_MODE_DISTANCE = 35;
 var CHECK_AVATAR = true;
-var MIN_DISTANCE = 0.2;
+var MIN_DISTANCE_FOR_REDRAW_METERS = 0.1;
 function maybeRedraw(uuid) {
     var avatar = _this.avatars[uuid];
     getAvatarData(uuid);
 
     getDistance(uuid);
-    var avatarDistance = getDistance(uuid, CHECK_AVATAR, false);
-    if (avatarNametagMode === "alwaysOn" && avatarDistance > MAX_RADIUS_IGNORE_METERS) {
-        showHide(uuid, "hide");
-    }
-
-    if (avatarNametagMode === "alwaysOn" && avatarDistance < MAX_RADIUS_IGNORE_METERS) {
-        showHide(uuid, "show");
-    }
+    var distanceDelta = Math.abs(avatar.currentDistance - avatar.previousDistance);
 
     var name = getCorrectName(uuid);
 
     if (avatar.previousName !== name) {
         updateName(uuid, name);
-    } else {
+    } else if (distanceDelta > MIN_DISTANCE_FOR_REDRAW_METERS) {
         redraw(uuid);
     }
+}
 
+
+// Check to see if we need to add or remove this avatar during always on mode
+function maybeAddOrRemoveIntervalCheck() {
+    AvatarManager
+        .getAvatarIdentifiers()
+        .forEach(function (avatar) {
+            if (avatar) {
+                var avatarDistance = quickDistanceCheckForNonSelectedAvatars(avatar);
+                if (avatar && avatarNametagMode === "alwaysOn" && !(avatar in _this.avatars) && avatarDistance < MAX_RADIUS_IGNORE_METERS) {
+                    add(avatar);
+                    return;
+                }
+                if (avatarDistance > MAX_RADIUS_IGNORE_METERS) {
+                    maybeRemove(avatar);
+                }
+            }
+        });
 }
 
 
 // Handle redrawing if needed
+var MIN_DISTANCE = 0.1;
 function redraw(uuid) {
     var avatar = _this.avatars[uuid];
 
@@ -447,7 +466,7 @@ function add(uuid) {
 
     _this.selectedAvatars[uuid] = true;
     if (avatarNametagMode === "alwaysOn") {
-        entityProps.lifetime = -1;
+        entityProps.lifetime = ALWAYS_ON_MAX_LIFETIME_IN_SECONDS;
     } else {
         entityProps.lifetime = DEFAULT_LIFETIME;
     }
@@ -521,16 +540,20 @@ function removeNametag(uuid) {
 // #region API
 
 
-// Create the manager and hook up username signal
+// Create the manager.
 function create() {
+    if (avatarNametagMode === "alwaysOn") {
+        handleAvatarNametagMode("alwaysOn");
+    }
 
     return _this;
 }
 
 
-// Destory the manager and disconnect from username signal
+// Destroy the manager
 function destroy() {
     _this.reset();
+
     return _this;
 }
 
@@ -601,7 +624,9 @@ function maybeRemove(uuid) {
 
 // Check to see if we need to add this user to our list
 function maybeAdd(uuid) {
-    if (uuid && avatarNametagMode === "alwaysOn" && !(uuid in _this.avatars)) {
+    var avatarDistance = quickDistanceCheckForNonSelectedAvatars(uuid);
+
+    if (uuid && avatarNametagMode === "alwaysOn" && !(uuid in _this.avatars) && avatarDistance < MAX_RADIUS_IGNORE_METERS) {
         add(uuid);
     }
 }
@@ -628,6 +653,7 @@ function reset() {
     removeAllNametags();
     _this.avatars = {};
     shouldToggleInterval();
+    maybeClearAlwaysOnAvatarDistanceCheck();
 
     return _this;
 }

scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js

@@ -8,8 +8,8 @@
 //
 //    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 = Script.require('./resources/modules/pickRayController.js');
+var NameTagListManager = Script.require('./resources/modules/nameTagListManager.js');
 var pickRayController = new PickRayController();
 var nameTagListManager = new NameTagListManager();
 
@@ -31,6 +31,7 @@ function selectAvatar(uuid, intersection) {
 // Handles reset of list if you change domains
 function onDomainChange() {
     nameTagListManager.reset();
+    nameTagListManager.handleAvatarNametagMode(avatarNametagMode);
 }
 
 

scripts/system/create/EditEntityList.qml

@@ -1,8 +1,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtWebChannel 1.0
-import "../../controls"
-import "../toolbars"
+import controls 1.0
+import hifi.toolbars 1.0
 import QtGraphicalEffects 1.0
 import controlsUit 1.0 as HifiControls
 import stylesUit 1.0

scripts/system/create/EditTabView.qml

@@ -1,8 +1,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtWebChannel 1.0
-import "../../controls"
-import "../toolbars"
+import controls 1.0
+import hifi.toolbars 1.0
 import QtGraphicalEffects 1.0
 import controlsUit 1.0 as HifiControls
 import stylesUit 1.0
@@ -72,7 +72,7 @@ TabBar {
 
 
                         NewEntityButton {
-                            icon: "icons/create-icons/94-model-01.svg"
+                            icon: "create-icons/94-model-01.svg"
                             text: "MODEL"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -84,7 +84,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/21-cube-01.svg"
+                            icon: "create-icons/21-cube-01.svg"
                             text: "SHAPE"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -96,7 +96,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/24-light-01.svg"
+                            icon: "create-icons/24-light-01.svg"
                             text: "LIGHT"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -108,7 +108,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/20-text-01.svg"
+                            icon: "create-icons/20-text-01.svg"
                             text: "TEXT"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -120,7 +120,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/image.svg"
+                            icon: "create-icons/image.svg"
                             text: "IMAGE"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -132,7 +132,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/25-web-1-01.svg"
+                            icon: "create-icons/25-web-1-01.svg"
                             text: "WEB"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -144,7 +144,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/23-zone-01.svg"
+                            icon: "create-icons/23-zone-01.svg"
                             text: "ZONE"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -156,7 +156,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/90-particles-01.svg"
+                            icon: "create-icons/90-particles-01.svg"
                             text: "PARTICLE"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -168,7 +168,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/126-material-01.svg"
+                            icon: "create-icons/126-material-01.svg"
                             text: "MATERIAL"
                             onClicked: {
                                 editRoot.sendToScript({

scripts/system/create/EditTools.qml

@@ -37,7 +37,7 @@ StackView {
     }
 
     function pushSource(path) {
-        var item = Qt.createComponent(Qt.resolvedUrl("../../" + path));
+        var item = Qt.createComponent(Qt.resolvedUrl(path));
         editRoot.push(item, itemProperties,
                       StackView.Immediate);
         editRoot.currentItem.sendToScript.connect(editRoot.sendToScript);

scripts/system/create/EditToolsTabView.qml

@@ -1,8 +1,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtWebChannel 1.0
-import "../../controls"
-import "../toolbars"
+import controls 1.0
+import hifi.toolbars 1.0
 import QtGraphicalEffects 1.0
 import controlsUit 1.0 as HifiControls
 import stylesUit 1.0
@@ -78,7 +78,7 @@ TabBar {
 
 
                         NewEntityButton {
-                            icon: "icons/create-icons/94-model-01.svg"
+                            icon: "create-icons/94-model-01.svg"
                             text: "MODEL"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -90,7 +90,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/21-cube-01.svg"
+                            icon: "create-icons/21-cube-01.svg"
                             text: "SHAPE"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -102,7 +102,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/24-light-01.svg"
+                            icon: "create-icons/24-light-01.svg"
                             text: "LIGHT"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -114,7 +114,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/20-text-01.svg"
+                            icon: "create-icons/20-text-01.svg"
                             text: "TEXT"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -126,7 +126,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/image.svg"
+                            icon: "create-icons/image.svg"
                             text: "IMAGE"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -138,7 +138,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/25-web-1-01.svg"
+                            icon: "create-icons/25-web-1-01.svg"
                             text: "WEB"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -150,7 +150,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/23-zone-01.svg"
+                            icon: "create-icons/23-zone-01.svg"
                             text: "ZONE"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -162,7 +162,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/90-particles-01.svg"
+                            icon: "create-icons/90-particles-01.svg"
                             text: "PARTICLE"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -174,7 +174,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "icons/create-icons/126-material-01.svg"
+                            icon: "create-icons/126-material-01.svg"
                             text: "MATERIAL"
                             onClicked: {
                                 editRoot.sendToScript({

scripts/system/create/NewEntityButton.qml

@@ -6,7 +6,7 @@ Item {
     id: newEntityButton
     property var uuid;
     property string text: "ENTITY"
-    property string icon: "icons/edit-icon.svg"
+    property string icon: Path.resources + "icons/edit-icon.svg"
     property string activeText: newEntityButton.text
     property string activeIcon: newEntityButton.icon
     property bool isActive: false
@@ -47,14 +47,6 @@ Item {
         anchors.topMargin: 0
     }
 
-    function urlHelper(src) {
-        if (src.match(/\bhttp/)) {
-            return src;
-        } else {
-            return "../../../" + src;
-        }
-    }
-
     Rectangle {
         id: buttonOutline
         color: "#00000000"
@@ -96,7 +88,7 @@ Item {
         anchors.bottomMargin: 5
         anchors.horizontalCenter: parent.horizontalCenter
         fillMode: Image.Stretch
-        source: newEntityButton.urlHelper(newEntityButton.icon)
+        source: newEntityButton.icon
     }
 
     ColorOverlay {

scripts/system/create/NewMaterialDialog.qml

@@ -15,7 +15,7 @@ import QtQuick.Dialogs 1.2 as OriginalDialogs
 
 import stylesUit 1.0
 import controlsUit 1.0
-import "../dialogs"
+import dialogs 1.0
 
 Rectangle {
     id: newMaterialDialog

scripts/system/create/NewModelDialog.qml

@@ -14,7 +14,7 @@ import QtQuick.Dialogs 1.2 as OriginalDialogs
 
 import stylesUit 1.0
 import controlsUit 1.0
-import "../dialogs"
+import dialogs 1.0
 
 Rectangle {
     id: newModelDialog

scripts/system/edit.js

@@ -45,7 +45,7 @@ var MAX_DEFAULT_ENTITY_LIST_HEIGHT = 942;
 var DEFAULT_IMAGE = "https://hifi-content.s3.amazonaws.com/DomainContent/production/no-image.jpg";
 
 var createToolsWindow = new CreateWindow(
-    Script.resourcesPath() + "qml/hifi/tablet/EditTools.qml",
+    Script.resolvePath("create/EditTools.qml"),
     'Create Tools',
     'com.highfidelity.create.createToolsWindow',
     function () {
@@ -812,7 +812,7 @@ var toolBar = (function () {
         tablet.screenChanged.connect(function (type, url) {
             var isGoingToHomescreenOnDesktop = (!shouldUseEditTabletApp() &&
                 (url === 'hifi/tablet/TabletHome.qml' || url === ''));
-            if (isActive && (type !== "QML" || url !== "hifi/tablet/Edit.qml") && !isGoingToHomescreenOnDesktop) {
+            if (isActive && (type !== "QML" || url !== Script.resolvePath("create/Edit.qml")) && !isGoingToHomescreenOnDesktop) {
                 that.setActive(false);
             }
         });
@@ -841,10 +841,10 @@ var toolBar = (function () {
                 if (shouldUseEditTabletApp()) {
                     // tablet version of new-model dialog
                     var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
-                    tablet.pushOntoStack("hifi/tablet/New" + entityType + "Dialog.qml");
+                    tablet.pushOntoStack(Script.resolvePath("create/New" + entityType + "Dialog.qml"));
                 } else {
                     closeExistingDialogWindow();
-                    var qmlPath = Script.resourcesPath() + "qml/hifi/tablet/New" + entityType + "Window.qml";
+                    var qmlPath = Script.resolvePath("create/New" + entityType + "Window.qml");
                     var DIALOG_WINDOW_SIZE = { x: 500, y: 300 };
                     dialogWindow = Desktop.createWindow(qmlPath, {
                         title: "New " + entityType + " Entity",
@@ -965,7 +965,7 @@ var toolBar = (function () {
             Controller.disableMapping(CONTROLLER_MAPPING_NAME);
         } else {
             if (shouldUseEditTabletApp()) {
-                tablet.loadQMLSource("hifi/tablet/Edit.qml", true);
+                tablet.loadQMLSource(Script.resolvePath("create/Edit.qml"), true);
             } else {
                 // make other apps inactive while in desktop mode
                 tablet.gotoHomeScreen();

scripts/system/libraries/entityList.js

@@ -37,7 +37,7 @@ EntityListTool = function(shouldUseEditTabletApp) {
     var ENTITY_LIST_WIDTH = 495;
     var MAX_DEFAULT_CREATE_TOOLS_HEIGHT = 778;
     var entityListWindow = new CreateWindow(
-        Script.resolvePath("EditEntityList.qml"),
+        Script.resolvePath("../create/EditEntityList.qml"),
         'Entity List',
         'com.highfidelity.create.entityListWindow',
         function () {