Merge branch 'master' of https://github.com/highfidelity/hifi into qmlWindowFixes

examples/away.js

@@ -196,6 +196,7 @@ function goActive() {
     }
     MyAvatar.setEnableMeshVisible(true); // IWBNI we respected Developer->Avatar->Draw Mesh setting.
     stopAwayAnimation();
+    MyAvatar.reset(true);
     hideOverlay();
 
     // restore overlays state to what it was when we went "away"

examples/directory.js

@@ -27,6 +27,7 @@ var directoryWindow = new OverlayWebWindow({
 
 var toolHeight = 50;
 var toolWidth = 50;
+var TOOLBAR_MARGIN_Y = 25;
 
 
 function showDirectory() {
@@ -53,11 +54,14 @@ var toolBar = (function() {
         browseDirectoryButton;
 
     function initialize() {
-        toolBar = new ToolBar(0, 0, ToolBar.VERTICAL, "highfidelity.directory.toolbar", function(windowDimensions, toolbar) {
+        toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.directory.toolbar", function(windowDimensions, toolbar) {
             return {
-                x: windowDimensions.x - 8 - toolbar.width,
+                x: windowDimensions.x / 2,  
-                y: 50
+                y: windowDimensions.y
             };
+        }, {
+            x: -2 * toolWidth,
+            y: -TOOLBAR_MARGIN_Y - toolHeight
         });
         browseDirectoryButton = toolBar.addTool({
             imageURL: toolIconUrl + "directory-01.svg",

examples/edit.js

@@ -53,6 +53,7 @@ selectionManager.addEventListener(function() {
 var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
 var toolHeight = 50;
 var toolWidth = 50;
+var TOOLBAR_MARGIN_Y = 25;
 
 var DEGREES_TO_RADIANS = Math.PI / 180.0;
 var RADIANS_TO_DEGREES = 180.0 / Math.PI;
@@ -179,11 +180,14 @@ var toolBar = (function() {
         newParticleButton
 
     function initialize() {
-        toolBar = new ToolBar(0, 0, ToolBar.VERTICAL, "highfidelity.edit.toolbar", function(windowDimensions, toolbar) {
+        toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.edit.toolbar", function(windowDimensions, toolbar) {
             return {
-                x: windowDimensions.x - 8 - toolbar.width,
+                x: windowDimensions.x / 2,
-                y: (windowDimensions.y - toolbar.height) / 2
+                y: windowDimensions.y
             };
+        }, {
+            x: toolWidth,
+            y: -TOOLBAR_MARGIN_Y - toolHeight
         });
 
         activeButton = toolBar.addTool({

examples/example/games/planky.js

@@ -10,9 +10,9 @@
 //    Distributed under the Apache License, Version 2.0.
 //    See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
+HIFI_PUBLIC_BUCKET = 'http://s3.amazonaws.com/hifi-public/';
 
-Script.include("../../libraries/toolBars.js");
+Script.include('../../libraries/toolBars.js');
 
 const DEFAULT_NUM_LAYERS = 16;
 const DEFAULT_BASE_DIMENSION = { x: 7, y: 2, z: 7 };
@@ -30,6 +30,8 @@ const DEFAULT_RESTITUTION = 0.0;
 const DEFAULT_SPAWN_DISTANCE = 3;
 const DEFAULT_BLOCK_YAW_OFFSET = 45;
 
+const PLANKY_LIFETIME = 3600; // 1 hour (3600 seconds)
+
 var editMode = false;
 
 const BUTTON_DIMENSIONS = {width: 49, height: 49};
@@ -51,13 +53,17 @@ SettingsWindow = function() {
     this.plankyStack = null;
     this.webWindow = null;
     this.init = function(plankyStack) {
-        _this.webWindow = new OverlayWebWindow('Planky', Script.resolvePath('../../html/plankySettings.html'), 255, 500, true);
+        _this.webWindow = new OverlayWebWindow({
+            title: 'Planky',
+            source: Script.resolvePath('../../html/plankySettings.html'),
+            toolWindow: true
+        });
         _this.webWindow.setVisible(false);
-        _this.webWindow.eventBridge.webEventReceived.connect(_this.onWebEventReceived);
+        _this.webWindow.webEventReceived.connect(_this.onWebEventReceived);
         _this.plankyStack = plankyStack;
     };
     this.sendData = function(data) {
-        _this.webWindow.eventBridge.emitScriptEvent(JSON.stringify(data));
+        _this.webWindow.emitScriptEvent(JSON.stringify(data));
     };
     this.onWebEventReceived = function(data) {
         data = JSON.parse(data);
@@ -188,7 +194,8 @@ PlankyStack = function() {
                 dimensions: _this.options.baseDimension,
                 position: Vec3.sum(_this.basePosition, {y: -(_this.options.baseDimension.y / 2)}),
                 rotation: _this.baseRotation,
-                shapeType: 'box'
+                shapeType: 'box',
+                lifetime: PLANKY_LIFETIME
             });
             return;
         }
@@ -254,7 +261,8 @@ PlankyStack = function() {
             density: _this.options.density,
             velocity: {x: 0, y: 0, z: 0},
             angularVelocity: Quat.fromPitchYawRollDegrees(0, 0, 0),
-            collisionless: true
+            collisionless: true,
+            lifetime: PLANKY_LIFETIME
         };
         _this.planks.forEach(function(plank, index, object) {
             if (plank.layer === layer && plank.row === row) {
@@ -304,6 +312,7 @@ var settingsWindow = new SettingsWindow();
 var plankyStack = new PlankyStack();
 settingsWindow.init(plankyStack);
 
+// This function is used to get the ideal y-location for a floor
 function grabLowestJointY() {
     var jointNames = MyAvatar.getJointNames();
     var floorY = MyAvatar.position.y;

examples/examples.js

@@ -27,6 +27,7 @@ var examplesWindow = new OverlayWebWindow({
 
 var toolHeight = 50;
 var toolWidth = 50;
+var TOOLBAR_MARGIN_Y = 25;
 
 
 function showExamples(marketplaceID) {
@@ -58,11 +59,14 @@ var toolBar = (function() {
         browseExamplesButton;
 
     function initialize() {
-        toolBar = new ToolBar(0, 0, ToolBar.VERTICAL, "highfidelity.examples.toolbar", function(windowDimensions, toolbar) {
+        toolBar = new ToolBar(0, 0, ToolBar.HORIXONTAL, "highfidelity.examples.toolbar", function(windowDimensions, toolbar) {
             return {
-                x: windowDimensions.x - 8 - toolbar.width,
+                x: windowDimensions.x / 2,
-                y: 135
+                y: windowDimensions.y
             };
+        }, {
+            x: -toolWidth / 2,
+            y: -TOOLBAR_MARGIN_Y - toolHeight
         });
         browseExamplesButton = toolBar.addTool({
             imageURL: toolIconUrl + "examples-01.svg",

examples/html/plankySettings.html

@@ -3,11 +3,15 @@
 <head>
 <link rel="stylesheet" type="text/css" href="style.css">
 <script type="text/javascript" src="jquery-2.1.4.min.js"></script>
+<script type="text/javascript" src="qrc:///qtwebchannel/qwebchannel.js"></script>
+<script type="text/javascript" src="eventBridgeLoader.js"></script>
 <script type="text/javascript">
 var properties = [];
-function sendWebEvent(data) {
+
-    EventBridge.emitWebEvent(JSON.stringify(data));
+var sendWebEvent = function(data) {
+    console.log('sendWebEvent not initialized.');
 }
+
 PropertyInput = function(key, label, value, attributes) {
     this.key = key;
     this.label = label;
@@ -93,7 +97,7 @@ function addHeader(label) {
     $('#properties-list').append($('<div>').addClass('section-header').append($('<label>').text(label)));
 }
 
-$(function() {  
+$(function() {
     addHeader('Stack Settings');
     properties['numLayers'] = new NumberInput('numLayers', 'Layers', 17, {'min': 0, 'max': 300, 'step': 1});
     properties['blocksPerLayer'] = new NumberInput('blocksPerLayer', 'Blocks per layer', 4, {'min': 1, 'max': 100, 'step': 1});
@@ -120,7 +124,8 @@ $(function() {
         .append($('<input>').val('factory reset').attr('type', 'button').on('click', function() { sendWebEvent({action: 'factory-reset'}); }))
         .append($('<input>').val('save as default').attr('type', 'button').on('click', function() { sendWebEvent({action: 'save-default'}); }))
         .append($('<input>').val('cleanup planky').attr('type', 'button').on('click', function() { sendWebEvent({action: 'cleanup'}); }));
-    if (window.EventBridge !== undefined) {
+
+    openEventBridge(function() {
         EventBridge.scriptEventReceived.connect(function(data) {
             data = JSON.parse(data);
             if (data.action == 'load') {
@@ -129,12 +134,15 @@ $(function() {
                 });
             }
         });
-    }
+        sendWebEvent = function(data) {
-    sendWebEvent({action: 'loaded'});
+            EventBridge.emitWebEvent(JSON.stringify(data));
+        };
+        sendWebEvent({action: 'loaded'});
+    });
 });
 </script>
 </head>
 <body class="properties">
     <div id="properties-list"></div>
 </body>
-</html>
+</html>

examples/libraries/toolBars.js

@@ -139,12 +139,13 @@ Tool.prototype = new Overlay2D;
 Tool.IMAGE_HEIGHT = 50;
 Tool.IMAGE_WIDTH = 50;
 
-ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPositionFunction) {
+ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPositionFunction, optionalOffset) {
     this.tools = new Array();
     this.x = x;
     this.y = y;
+    this.offset = optionalOffset ? optionalOffset : { x: 0, y: 0 };
     this.width = 0;
-    this.height = 0
+    this.height = 0;
     this.backAlpha = 1.0;
     this.back = Overlays.addOverlay("rectangle", {
                     color: { red: 255, green: 255, blue: 255 },
@@ -237,7 +238,7 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
         }
     }
     
-    this.move = function(x, y) {
+    this.move = function (x, y) {
         var dx = x - this.x;
         var dy = y - this.y;
         this.x = x;
@@ -370,14 +371,14 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
     that.onResizeViewport = function (newSize) { // Can be overridden or extended by clients.
         var recommendedRect = Controller.getRecommendedOverlayRect();
         var recommendedDimmensions = { x: recommendedRect.width, y: recommendedRect.height };
-        var originRelativeX = (that.x - that.origin.x);
+        var originRelativeX = (that.x - that.origin.x - that.offset.x);
-        var originRelativeY = (that.y - that.origin.y);
+        var originRelativeY = (that.y - that.origin.y - that.offset.y);
         var fractionX = clamp(originRelativeX / that.windowDimensions.x, 0, 1);
         var fractionY = clamp(originRelativeY / that.windowDimensions.y, 0, 1);
         that.windowDimensions = newSize || recommendedDimmensions;
         that.origin = { x: recommendedRect.x, y: recommendedRect.y };
-        var newX = (fractionX * that.windowDimensions.x) + recommendedRect.x;
+        var newX = (fractionX * that.windowDimensions.x) + recommendedRect.x + that.offset.x;
-        var newY = (fractionY * that.windowDimensions.y) + recommendedRect.y;
+        var newY = (fractionY * that.windowDimensions.y) + recommendedRect.y + that.offset.y;
         that.move(newX, newY);
     };
     if (optionalPersistenceKey) {
@@ -387,7 +388,7 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
             var screenSize = { x: recommendedRect.width, y: recommendedRect.height };
             if (screenSize.x > 0 && screenSize.y > 0) {
                 // Guard against invalid screen size that can occur at shut-down.
-                var fraction = {x: that.x / screenSize.x, y: that.y / screenSize.y};
+                var fraction = {x: (that.x - that.offset.x) / screenSize.x, y: (that.y - that.offset.y) / screenSize.y};
                 Settings.setValue(this.fractionKey, JSON.stringify(fraction));
             }
         }
@@ -456,7 +457,7 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
         var screenSize = { x: recommendedRect.width, y: recommendedRect.height };
         if (savedFraction) {
             // If we have saved data, keep the toolbar at the same proportion of the screen width/height.
-            that.move(savedFraction.x * screenSize.x, savedFraction.y * screenSize.y);
+            that.move(savedFraction.x * screenSize.x + that.offset.x, savedFraction.y * screenSize.y + that.offset.y);
         } else if (!optionalInitialPositionFunction) {
             print("No initPosition(screenSize, intializedToolbar) specified for ToolBar");
         } else {
@@ -464,7 +465,7 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
             var that = this;
             Script.setTimeout(function () {
                 var position = optionalInitialPositionFunction(screenSize, that);
-                that.move(position.x, position.y);
+                that.move(position.x + that.offset.x, position.y + that.offset.y);
             }, 0);
         }
     }

interface/src/avatar/MyAvatar.cpp

@@ -235,7 +235,12 @@ QByteArray MyAvatar::toByteArray(bool cullSmallChanges, bool sendAll) {
     return AvatarData::toByteArray(cullSmallChanges, sendAll);
 }
 
-void MyAvatar::reset(bool andReload) {
+void MyAvatar::reset(bool andRecenter) {
+
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "reset", Q_ARG(bool, andRecenter));
+        return;
+    }
 
     // Reset dynamic state.
     _wasPushing = _isPushing = _isBraking = false;
@@ -245,7 +250,7 @@ void MyAvatar::reset(bool andReload) {
     _targetVelocity = glm::vec3(0.0f);
     setThrust(glm::vec3(0.0f));
 
-    if (andReload) {
+    if (andRecenter) {
         // derive the desired body orientation from the *old* hmd orientation, before the sensor reset.
         auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation..
 

interface/src/avatar/MyAvatar.h

@@ -93,7 +93,7 @@ public:
     AudioListenerMode getAudioListenerModeCamera() const { return FROM_CAMERA; }
     AudioListenerMode getAudioListenerModeCustom() const { return CUSTOM; }
 
-    void reset(bool andReload = false);
+    Q_INVOKABLE void reset(bool andRecenter = false);
     void update(float deltaTime);
     void preRender(RenderArgs* renderArgs);
 

interface/src/scripting/AssetMappingsScriptingInterface.cpp

@@ -292,6 +292,8 @@ void AssetMappingModel::refresh() {
         } else {
             emit errorGettingMappings(request->getErrorString());
         }
+
+        request->deleteLater();
     });
 
     request->start();

libraries/entities/src/EntityTree.cpp

@@ -1459,10 +1459,12 @@ void EntityTree::trackIncomingEntityLastEdited(quint64 lastEditedTime, int bytes
 
 void EntityTree::callLoader(EntityItemID entityID) {
     // this is used to bounce from the networking thread to the main thread
-    EntityItemPointer entity = findEntityByEntityItemID(entityID);
+    this->withWriteLock([&] {
-    if (entity) {
+        EntityItemPointer entity = findEntityByEntityItemID(entityID);
-        entity->loader();
+        if (entity) {
-    }
+            entity->loader();
+        }
+    });
 }
 
 int EntityTree::getJointIndex(const QUuid& entityID, const QString& name) const {

server-console/src/splash.html

@@ -28,7 +28,7 @@ You can make your home yours by uploading your own models and scripts.
                     </p>
 
                     <p>
-                        <em>To see how,</em> <a target="_blank" href="https://docs.highfidelity.com/docs/the-basics">check out 'The Basics'</a>
+                        <em>To get started exploring and creating,</em> <a target="_blank" href="https://docs.highfidelity.com/docs/explore">check out our Quick-start Guide</a>
                     </p>
                 </div>
                 <div class="column center">