Merge remote-tracking branch 'upstream/master' into text-renderer

examples/defaultScripts.js

@@ -17,3 +17,4 @@ Script.load("headMove.js");
 Script.load("inspect.js");
 Script.load("lobby.js");
 Script.load("notifications.js");
+Script.load("lookWithMouse.js")

examples/editEntities.js

@@ -46,28 +46,8 @@ gridTool.setVisible(false);
 
 var entityListTool = EntityListTool();
 
-var hasShownPropertiesTool = false;
-
-var entityListVisible = false;
-
 selectionManager.addEventListener(function() {
     selectionDisplay.updateHandles();
-    if (selectionManager.hasSelection() && !hasShownPropertiesTool) {
-        // Open properties and model list, but force selection of model list tab
-        propertiesTool.setVisible(false);
-        entityListTool.setVisible(false);
-        gridTool.setVisible(false);
-        propertiesTool.setVisible(true);
-        entityListTool.setVisible(true);
-        gridTool.setVisible(true);
-        Window.setFocus();
-        hasShownPropertiesTool = true;
-    }
-    if (!selectionManager.hasSelection()) {
-        toolBar.setActive(false);
-    } else {
-        toolBar.setActive(true);
-    }
 });
 
 var windowDimensions = Controller.getViewportDimensions();
@@ -94,9 +74,11 @@ var DEFAULT_DIMENSIONS = {
 };
 
 var MENU_INSPECT_TOOL_ENABLED = "Inspect Tool";
+var MENU_AUTO_FOCUS_ON_SELECT = "Auto Focus on Select";
 var MENU_EASE_ON_FOCUS = "Ease Orientation on Focus";
 
 var SETTING_INSPECT_TOOL_ENABLED = "inspectToolEnabled";
+var SETTING_AUTO_FOCUS_ON_SELECT = "autoFocusOnSelect";
 var SETTING_EASE_ON_FOCUS = "cameraEaseOnFocus";
 
 var modelURLs = [
@@ -138,10 +120,9 @@ var toolBar = (function () {
         // Hide active button for now - this may come back, so not deleting yet.
         activeButton = toolBar.addTool({
             imageURL: toolIconUrl + "models-tool.svg",
-            // subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
+            subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
-            subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: 0, height: 0 },
+            width: toolWidth,
-            width: 0,//toolWidth,
+            height: toolHeight,
-            height: 0,//toolHeight,
             alpha: 0.9,
             visible: true
         }, true, false);
@@ -253,7 +234,10 @@ var toolBar = (function () {
             } else {
                 hasShownPropertiesTool = false;
                 cameraManager.enable();
-                grid.setEnabled(true);
+                entityListTool.setVisible(true);
+                gridTool.setVisible(true);
+                propertiesTool.setVisible(true);
+                Window.setFocus();
             }
         }
         toolBar.selectTool(activeButton, active);
@@ -440,11 +424,11 @@ var toolBar = (function () {
                 Entities.addEntity({ 
                                 type: "Text",
                                 position: grid.snapToSurface(grid.snapToGrid(position, false, DEFAULT_DIMENSIONS), DEFAULT_DIMENSIONS),
-                                dimensions: DEFAULT_DIMENSIONS,
+                                dimensions: { x: 0.5, y: 0.3, z: 0.01 },
-                                backgroundColor: { red: 0, green: 0, blue: 0 },
+                                backgroundColor: { red: 64, green: 64, blue: 64 },
                                 textColor: { red: 255, green: 255, blue: 255 },
                                 text: "some text",
-                                lineHight: "0.1"
+                                lineHeight: 0.06
                                 });
             } else {
                 print("Can't create box: Text would be out of bounds.");
@@ -535,7 +519,7 @@ function mousePressEvent(event) {
             if (result !== null) {
                 var currentProperties = Entities.getEntityProperties(result.entityID);
                 cameraManager.enable();
-                cameraManager.focus(currentProperties.position, null, true);
+                cameraManager.focus(currentProperties.position, null, Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
                 cameraManager.mousePressEvent(event);
             }
         } else {
@@ -551,6 +535,9 @@ var idleMouseTimerId = null;
 var IDLE_MOUSE_TIMEOUT = 200;
 
 function mouseMoveEvent(event) {
+    if (!isActive) {
+        return;
+    }
     if (idleMouseTimerId) {
         Script.clearTimeout(idleMouseTimerId);
     }
@@ -618,7 +605,7 @@ function mouseReleaseEvent(event) {
 }
 
 function mouseClickEvent(event) {
-    if (!event.isRightButton) {
+    if (!event.isLeftButton || !isActive) {
         return;
     }
 
@@ -681,9 +668,11 @@ function mouseClickEvent(event) {
             print("Model selected: " + foundEntity.id);
             selectionDisplay.select(selectedEntityID, event);
 
-            cameraManager.focus(selectionManager.worldPosition,
+            if (Menu.isOptionChecked(MENU_AUTO_FOCUS_ON_SELECT)) {
-                                selectionManager.worldDimensions,
+                cameraManager.focus(selectionManager.worldPosition,
-                                true);
+                                    selectionManager.worldDimensions,
+                                    Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
+            }
         }
     }
 }
@@ -725,7 +714,9 @@ function setupModelMenus() {
     Menu.addMenuItem({ menuName: "File", menuItemName: "Import Models", shortcutKey: "CTRL+META+I", afterItem: "Export Models" });
 
 
-    Menu.addMenuItem({ menuName: "View", menuItemName: MENU_EASE_ON_FOCUS, afterItem: MENU_INSPECT_TOOL_ENABLED,
+    Menu.addMenuItem({ menuName: "View", menuItemName: MENU_AUTO_FOCUS_ON_SELECT, afterItem: MENU_INSPECT_TOOL_ENABLED,
+                       isCheckable: true, isChecked: Settings.getValue(SETTING_AUTO_FOCUS_ON_SELECT) == "true" });
+    Menu.addMenuItem({ menuName: "View", menuItemName: MENU_EASE_ON_FOCUS, afterItem: MENU_AUTO_FOCUS_ON_SELECT,
                        isCheckable: true, isChecked: Settings.getValue(SETTING_EASE_ON_FOCUS) == "true" });
 
     Entities.setLightsArePickable(false);
@@ -751,11 +742,12 @@ function cleanupModelMenus() {
     Menu.removeMenuItem("File", "Import Models");
 
     Menu.removeMenuItem("View", MENU_INSPECT_TOOL_ENABLED);
+    Menu.removeMenuItem("View", MENU_AUTO_FOCUS_ON_SELECT);
     Menu.removeMenuItem("View", MENU_EASE_ON_FOCUS);
 }
 
 Script.scriptEnding.connect(function() {
-    Settings.setValue(SETTING_INSPECT_TOOL_ENABLED, Menu.isOptionChecked(MENU_INSPECT_TOOL_ENABLED));
+    Settings.setValue(SETTING_AUTO_FOCUS_ON_SELECT, Menu.isOptionChecked(MENU_AUTO_FOCUS_ON_SELECT));
     Settings.setValue(SETTING_EASE_ON_FOCUS, Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
 
     progressDialog.cleanup();

examples/libraries/entityCameraTool.js

@@ -15,11 +15,11 @@ var MOUSE_SENSITIVITY = 0.9;
 var SCROLL_SENSITIVITY = 0.05;
 var PAN_ZOOM_SCALE_RATIO = 0.4;
 
-var KEY_ORBIT_SENSITIVITY = 40;
+var KEY_ORBIT_SENSITIVITY = 90;
-var KEY_ZOOM_SENSITIVITY = 10;
+var KEY_ZOOM_SENSITIVITY = 3;
 
-// Scaling applied based on the size of the object being focused
+// Scaling applied based on the size of the object being focused (Larger values focus further away)
-var FOCUS_ZOOM_SCALE = 1.3;
+var FOCUS_ZOOM_SCALE = 2.3;
 
 // Minimum zoom level when focusing on an object
 var FOCUS_MIN_ZOOM = 0.5;
@@ -433,8 +433,13 @@ CameraManager = function() {
         that.targetYaw += (actions.orbitRight - actions.orbitLeft) * dt * KEY_ORBIT_SENSITIVITY;
         that.targetPitch += (actions.orbitUp - actions.orbitDown) * dt * KEY_ORBIT_SENSITIVITY;
         that.targetPitch = clamp(that.targetPitch, -90, 90);
-        that.targetZoomDistance += (actions.orbitBackward - actions.orbitForward) * dt * KEY_ZOOM_SENSITIVITY;
+
-        that.targetZoomDistance = clamp(that.targetZoomDistance, MIN_ZOOM_DISTANCE, MAX_ZOOM_DISTANCE);
+        var dZoom = actions.orbitBackward - actions.orbitForward;
+        if (dZoom) {
+            dZoom *= that.targetZoomDistance * dt * KEY_ZOOM_SENSITIVITY;
+            that.targetZoomDistance += dZoom;
+            that.targetZoomDistance = clamp(that.targetZoomDistance, MIN_ZOOM_DISTANCE, MAX_ZOOM_DISTANCE);
+        }
 
 
         if (easing) {

examples/libraries/entitySelectionTool.js

@@ -1221,7 +1221,7 @@ SelectionDisplay = (function () {
                 x: selectionManager.worldDimensions.x,
                 y: selectionManager.worldDimensions.z
             },
-            rotation: Quat.fromPitchYawRollDegrees(0, 0, 0),
+            rotation: Quat.fromPitchYawRollDegrees(90, 0, 0),
         });
 
 

interface/src/Application.cpp

@@ -73,6 +73,7 @@
 #include <PhysicsEngine.h>
 #include <ProgramObject.h>
 #include <ResourceCache.h>
+#include <ScriptCache.h>
 #include <SettingHandle.h>
 #include <SoundCache.h>
 #include <TextRenderer.h>
@@ -188,6 +189,7 @@ bool setupEssentials(int& argc, char** argv) {
     auto jsConsole = DependencyManager::set<StandAloneJSConsole>();
     auto dialogsManager = DependencyManager::set<DialogsManager>();
     auto bandwidthRecorder = DependencyManager::set<BandwidthRecorder>();
+    auto resouceCacheSharedItems = DependencyManager::set<ResouceCacheSharedItems>();
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
     auto speechRecognizer = DependencyManager::set<SpeechRecognizer>();
 #endif
@@ -514,6 +516,11 @@ Application::~Application() {
     _myAvatar = NULL;
     
     DependencyManager::destroy<GLCanvas>();
+    DependencyManager::destroy<AnimationCache>();
+    DependencyManager::destroy<TextureCache>();
+    DependencyManager::destroy<GeometryCache>();
+    DependencyManager::destroy<ScriptCache>();
+    DependencyManager::destroy<SoundCache>();
 }
 
 void Application::initializeGL() {

interface/src/Audio.cpp

@@ -139,23 +139,13 @@ void Audio::audioMixerKilled() {
 
 QAudioDeviceInfo getNamedAudioDeviceForMode(QAudio::Mode mode, const QString& deviceName) {
     QAudioDeviceInfo result;
-// Temporarily enable audio device selection in Windows again to test how it behaves now
-//#ifdef WIN32
-#if FALSE
-    // NOTE
-    // this is a workaround for a windows only QtBug https://bugreports.qt-project.org/browse/QTBUG-16117
-    // static QAudioDeviceInfo objects get deallocated when QList<QAudioDevieInfo> objects go out of scope
-    result = (mode == QAudio::AudioInput) ? 
-        QAudioDeviceInfo::defaultInputDevice() : 
-        QAudioDeviceInfo::defaultOutputDevice();
-#else
     foreach(QAudioDeviceInfo audioDevice, QAudioDeviceInfo::availableDevices(mode)) {
         if (audioDevice.deviceName().trimmed() == deviceName.trimmed()) {
             result = audioDevice;
             break;
         }
     }
-#endif
+
     return result;
 }
 

interface/src/devices/MotionTracker.h

@@ -37,7 +37,7 @@ public:
 
     // Semantic and Index types to retreive the JointTrackers of this MotionTracker
     typedef std::string Semantic;
-    typedef int Index;
+    typedef uint32_t Index;
     static const Index INVALID_SEMANTIC = -1;
     static const Index INVALID_PARENT = -2;
 

interface/src/scripting/ControllerScriptingInterface.h

@@ -38,7 +38,7 @@ public slots:
 private:
 
     int  _deviceTrackerId;
-    int  _subTrackerId;
+    uint  _subTrackerId;
 
     // cache for the spatial
     SpatialEvent    _eventCache;

interface/src/ui/ApplicationOverlay.cpp

@@ -929,14 +929,13 @@ void ApplicationOverlay::renderStatsAndLogs() {
 
     //  Show on-screen msec timer
     if (Menu::getInstance()->isOptionChecked(MenuOption::FrameTimer)) {
-        char frameTimer[10];
         quint64 mSecsNow = floor(usecTimestampNow() / 1000.0 + 0.5);
-        sprintf(frameTimer, "%d\n", (int)(mSecsNow % 1000));
+        QString frameTimer = QString("%1\n").arg((int)(mSecsNow % 1000));
         int timerBottom =
             (Menu::getInstance()->isOptionChecked(MenuOption::Stats))
             ? 80 : 20;
         drawText(glCanvas->width() - 100, glCanvas->height() - timerBottom,
-            0.30f, 0.0f, 0, frameTimer, WHITE_TEXT);
+            0.30f, 0.0f, 0, frameTimer.toUtf8().constData(), WHITE_TEXT);
     }
     nodeBoundsDisplay.drawOverlay();
 }

interface/src/ui/OctreeStatsDialog.cpp

@@ -236,9 +236,8 @@ void OctreeStatsDialog::showOctreeServersOfType(int& serverCount, NodeType_t ser
             serverCount++;
             
             if (serverCount > _octreeServerLabelsCount) {
-                char label[128] = { 0 };
+                QString label = QString("%1 Server %2").arg(serverTypeName).arg(serverCount);
-                sprintf(label, "%s Server %d", serverTypeName, serverCount);
+                int thisServerRow = _octreeServerLables[serverCount-1] = AddStatItem(label.toUtf8().constData());
-                int thisServerRow = _octreeServerLables[serverCount-1] = AddStatItem(label);
                 _labels[thisServerRow]->setTextFormat(Qt::RichText);
                 _labels[thisServerRow]->setTextInteractionFlags(Qt::TextBrowserInteraction);
                 connect(_labels[thisServerRow], SIGNAL(linkActivated(const QString&)), this, SLOT(moreless(const QString&)));

interface/src/ui/Stats.cpp

@@ -256,25 +256,20 @@ void Stats::display(
     
     int columnOneHorizontalOffset = horizontalOffset;
 
-    char serverNodes[30];
+    QString serverNodes = QString("Servers: %1").arg(totalServers);
-    sprintf(serverNodes, "Servers: %d", totalServers);
+    QString avatarNodes = QString("Avatars: %1").arg(totalAvatars);
-    char avatarNodes[30];
+    QString framesPerSecond = QString("Framerate: %1 FPS").arg(fps, 3, 'f', 0);
-    sprintf(avatarNodes, "Avatars: %d", totalAvatars);
-    char framesPerSecond[30];
-    sprintf(framesPerSecond, "Framerate: %3.0f FPS", fps);
  
     verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, scale, rotation, font, serverNodes, color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, serverNodes.toUtf8().constData(), color);
     verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarNodes, color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarNodes.toUtf8().constData(), color);
     verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, scale, rotation, font, framesPerSecond, color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, framesPerSecond.toUtf8().constData(), color);
     
     // TODO: the display of these timing details should all be moved to JavaScript
     if (_expanded && Menu::getInstance()->isOptionChecked(MenuOption::DisplayTimingDetails)) {
         // Timing details...
-        const int TIMER_OUTPUT_LINE_LENGTH = 1000;
-        char perfLine[TIMER_OUTPUT_LINE_LENGTH];
         verticalOffset += STATS_PELS_PER_LINE * 4; // skip 4 lines to be under the other columns
         drawText(columnOneHorizontalOffset, verticalOffset, scale, rotation, font, 
                 "-------------------------------------------------------- Function "
@@ -301,12 +296,13 @@ void Stats::display(
             QString functionName = j.value(); 
             const PerformanceTimerRecord& record = allRecords.value(functionName);
 
-            sprintf(perfLine, "%120s: %8.4f [%6llu]", qPrintable(functionName),
+            QString perfLine = QString("%1: %2 [%3]").
-                        (float)record.getMovingAverage() / (float)USECS_PER_MSEC,
+                arg(QString(qPrintable(functionName)), 120).
-                        record.getCount());
+                arg((float)record.getMovingAverage() / (float)USECS_PER_MSEC, 8, 'f', 3).
-        
+                arg(record.getCount(), 6);
+
             verticalOffset += STATS_PELS_PER_LINE;
-            drawText(columnOneHorizontalOffset, verticalOffset, scale, rotation, font, perfLine, color);
+            drawText(columnOneHorizontalOffset, verticalOffset, scale, rotation, font, perfLine.toUtf8().constData(), color);
         }
     }
 
@@ -320,17 +316,15 @@ void Stats::display(
     }
     horizontalOffset += 5;
 
-    char packetsPerSecondString[30];
+    QString packetsPerSecondString = QString("Packets In/Out: %1/%2").arg(inPacketsPerSecond).arg(outPacketsPerSecond);
-    sprintf(packetsPerSecondString, "Packets In/Out: %d/%d", inPacketsPerSecond, outPacketsPerSecond);
+    QString averageMegabitsPerSecond = QString("Mbps In/Out: %1/%2").
-    char averageMegabitsPerSecond[30];
+        arg((float)inKbitsPerSecond * 1.0f / 1000.0f).
-    sprintf(averageMegabitsPerSecond, "Mbps In/Out: %3.2f/%3.2f",
+        arg((float)outKbitsPerSecond * 1.0f / 1000.0f);
-            (float)inKbitsPerSecond * 1.0f / 1000.0f,
-            (float)outKbitsPerSecond * 1.0f / 1000.0f);
 
     verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, scale, rotation, font, packetsPerSecondString, color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, packetsPerSecondString.toUtf8().constData(), color);
     verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, scale, rotation, font, averageMegabitsPerSecond, color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, averageMegabitsPerSecond.toUtf8().constData(), color);
 
 
 
@@ -375,44 +369,44 @@ void Stats::display(
         horizontalOffset += 5;
 
         
-        char audioPing[30];
+        QString audioPing;
         if (pingAudio >= 0) {
-            sprintf(audioPing, "Audio ping: %d", pingAudio);
+            audioPing = QString("Audio ping: %1").arg(pingAudio);
         } else {
-            sprintf(audioPing, "Audio ping: --");
+            audioPing = QString("Audio ping: --");
         }
 
-        char avatarPing[30];
+        QString avatarPing;
         if (pingAvatar >= 0) {
-            sprintf(avatarPing, "Avatar ping: %d", pingAvatar);
+            avatarPing = QString("Avatar ping: %1").arg(pingAvatar);
         } else {
-            sprintf(avatarPing, "Avatar ping: --");
+            avatarPing = QString("Avatar ping: --");
         }
 
-        char voxelAvgPing[30];
+        QString voxelAvgPing;
         if (pingVoxel >= 0) {
-            sprintf(voxelAvgPing, "Entities avg ping: %d", pingVoxel);
+            voxelAvgPing = QString("Entities avg ping: %1").arg(pingVoxel);
         } else {
-            sprintf(voxelAvgPing, "Entities avg ping: --");
+            voxelAvgPing = QString("Entities avg ping: --");
         }
 
         verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, scale, rotation, font, audioPing, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, audioPing.toUtf8().constData(), color);
         verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarPing, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarPing.toUtf8().constData(), color);
         verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, scale, rotation, font, voxelAvgPing, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, voxelAvgPing.toUtf8().constData(), color);
 
         if (_expanded) {
-            char voxelMaxPing[30];
+            QString voxelMaxPing;
             if (pingVoxel >= 0) {  // Average is only meaningful if pingVoxel is valid.
-                sprintf(voxelMaxPing, "Voxel max ping: %d", pingOctreeMax);
+                voxelMaxPing = QString("Voxel max ping: %1").arg(pingOctreeMax);
             } else {
-                sprintf(voxelMaxPing, "Voxel max ping: --");
+                voxelMaxPing = QString("Voxel max ping: --");
             }
 
             verticalOffset += STATS_PELS_PER_LINE;
-            drawText(horizontalOffset, verticalOffset, scale, rotation, font, voxelMaxPing, color);
+            drawText(horizontalOffset, verticalOffset, scale, rotation, font, voxelMaxPing.toUtf8().constData(), color);
         }
 
         verticalOffset = 0;
@@ -429,35 +423,35 @@ void Stats::display(
     }
     horizontalOffset += 5;
 
-    char avatarPosition[200];
+    QString avatarPosition = QString("Position: %1, %2, %3").
-    sprintf(avatarPosition, "Position: %.1f, %.1f, %.1f", avatarPos.x, avatarPos.y, avatarPos.z);
+        arg(avatarPos.x, -1, 'f', 1).
-    char avatarVelocity[30];
+        arg(avatarPos.y, -1, 'f', 1).
-    sprintf(avatarVelocity, "Velocity: %.1f", glm::length(myAvatar->getVelocity()));
+        arg(avatarPos.z, -1, 'f', 1);
-    char avatarBodyYaw[30];
+    QString avatarVelocity = QString("Velocity: %1").arg(glm::length(myAvatar->getVelocity()), -1, 'f', 1);
-    sprintf(avatarBodyYaw, "Yaw: %.1f", myAvatar->getBodyYaw());
+    QString avatarBodyYaw = QString("Yaw: %1").arg(myAvatar->getBodyYaw(), -1, 'f', 1);
-    char avatarMixerStats[200];
+    QString avatarMixerStats;
 
     verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarPosition, color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarPosition.toUtf8().constData(), color);
     verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarVelocity, color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarVelocity.toUtf8().constData(), color);
     verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarBodyYaw, color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarBodyYaw.toUtf8().constData(), color);
 
     if (_expanded) {
         SharedNodePointer avatarMixer = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::AvatarMixer);
         if (avatarMixer) {
-            sprintf(avatarMixerStats, "Avatar Mixer: %.f kbps, %.f pps",
+            avatarMixerStats = QString("Avatar Mixer: %1 kbps, %2 pps").
-                    roundf(bandwidthRecorder->getAverageInputKilobitsPerSecond(NodeType::AudioMixer) +
+                arg(roundf(bandwidthRecorder->getAverageInputKilobitsPerSecond(NodeType::AudioMixer) +
-                           bandwidthRecorder->getAverageOutputKilobitsPerSecond(NodeType::AudioMixer)),
+                           bandwidthRecorder->getAverageOutputKilobitsPerSecond(NodeType::AudioMixer))).
-                    roundf(bandwidthRecorder->getAverageInputPacketsPerSecond(NodeType::AudioMixer) +
+                arg(roundf(bandwidthRecorder->getAverageInputPacketsPerSecond(NodeType::AudioMixer) +
                            bandwidthRecorder->getAverageOutputPacketsPerSecond(NodeType::AudioMixer)));
         } else {
-            sprintf(avatarMixerStats, "No Avatar Mixer");
+            avatarMixerStats = QString("No Avatar Mixer");
         }
 
         verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarMixerStats, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarMixerStats.toUtf8().constData(), color);
         
         stringstream downloads;
         downloads << "Downloads: ";

libraries/audio/src/AudioFilterBank.h

@@ -52,7 +52,7 @@ public:
     AudioFilterBank() :
         _sampleRate(0.0f),
         _frameCount(0) {
-        for (int i = 0; i < _channelCount; ++i) {
+        for (uint32_t i = 0; i < _channelCount; ++i) {
             _buffer[ i ] = NULL;
         }
     }

libraries/entities/src/EntityItem.cpp

@@ -548,7 +548,10 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
             // is sending us data with a known "last simulated" time. That time is likely in the past, and therefore
             // this "new" data is actually slightly out of date. We calculate the time we need to skip forward and
             // use our simulation helper routine to get a best estimate of where the entity should be.
-            float skipTimeForward = (float)(now - _lastSimulated) / (float)(USECS_PER_SECOND);
+            const float MIN_TIME_SKIP = 0.0f;
+            const float MAX_TIME_SKIP = 1.0f; // in seconds
+            float skipTimeForward = glm::clamp((float)(now - _lastSimulated) / (float)(USECS_PER_SECOND), 
+                                        MIN_TIME_SKIP, MAX_TIME_SKIP);
             if (skipTimeForward > 0.0f) {
                 #ifdef WANT_DEBUG
                     qDebug() << "skipTimeForward:" << skipTimeForward;

libraries/entities/src/EntityTree.cpp

@@ -228,7 +228,7 @@ void EntityTree::setSimulation(EntitySimulation* simulation) {
     _simulation = simulation;
 }
 
-void EntityTree::deleteEntity(const EntityItemID& entityID) {
+void EntityTree::deleteEntity(const EntityItemID& entityID, bool force) {
     EntityTreeElement* containingElement = getContainingElement(entityID);
     if (!containingElement) {
         qDebug() << "UNEXPECTED!!!!  EntityTree::deleteEntity() entityID doesn't exist!!! entityID=" << entityID;
@@ -241,7 +241,7 @@ void EntityTree::deleteEntity(const EntityItemID& entityID) {
         return;
     }
 
-    if (existingEntity->getLocked()) {
+    if (existingEntity->getLocked() && !force) {
         qDebug() << "ERROR! EntityTree::deleteEntity() trying to delete locked entity. entityID=" << entityID;
         return;
     }
@@ -255,7 +255,7 @@ void EntityTree::deleteEntity(const EntityItemID& entityID) {
     _isDirty = true;
 }
 
-void EntityTree::deleteEntities(QSet<EntityItemID> entityIDs) {
+void EntityTree::deleteEntities(QSet<EntityItemID> entityIDs, bool force) {
     // NOTE: callers must lock the tree before using this method
     DeleteEntityOperator theOperator(this);
     foreach(const EntityItemID& entityID, entityIDs) {
@@ -271,7 +271,7 @@ void EntityTree::deleteEntities(QSet<EntityItemID> entityIDs) {
             continue;
         }
 
-        if (existingEntity->getLocked()) {
+        if (existingEntity->getLocked() && !force) {
             qDebug() << "ERROR! EntityTree::deleteEntities() trying to delete locked entity. entityID=" << entityID;
             continue;
         }
@@ -667,7 +667,7 @@ void EntityTree::update() {
             foreach (EntityItem* entity, entitiesToDelete) {
                 idsToDelete.insert(entity->getEntityItemID());
             }
-            deleteEntities(idsToDelete);
+            deleteEntities(idsToDelete, true);
         }
         unlock();
     }

libraries/entities/src/EntityTree.h

@@ -91,8 +91,8 @@ public:
     // use this method if you have a pointer to the entity (avoid an extra entity lookup)
     bool updateEntity(EntityItem* entity, const EntityItemProperties& properties);
 
-    void deleteEntity(const EntityItemID& entityID);
+    void deleteEntity(const EntityItemID& entityID, bool force = false);
-    void deleteEntities(QSet<EntityItemID> entityIDs);
+    void deleteEntities(QSet<EntityItemID> entityIDs, bool force = false);
     void removeEntityFromSimulation(EntityItem* entity);
 
     const EntityItem* findClosestEntity(glm::vec3 position, float targetRadius);

libraries/gpu/src/gpu/Texture.cpp

@@ -175,7 +175,7 @@ Texture::Size Texture::resize(Type type, const Element& texelFormat, uint16 widt
 
         // Evaluate the new size with the new format
         const int DIM_SIZE[] = {1, 1, 1, 6};
-        int size = DIM_SIZE[_type] *_width * _height * _depth * _numSamples * texelFormat.getSize();
+        uint32_t size = DIM_SIZE[_type] *_width * _height * _depth * _numSamples * texelFormat.getSize();
 
         // If size change then we need to reset 
         if (changed || (size != getSize())) {

libraries/networking/src/LimitedNodeList.cpp

@@ -412,25 +412,27 @@ void LimitedNodeList::handleNodeKill(const SharedNodePointer& node) {
 
 SharedNodePointer LimitedNodeList::addOrUpdateNode(const QUuid& uuid, NodeType_t nodeType,
                                                    const HifiSockAddr& publicSocket, const HifiSockAddr& localSocket) {
-    try {
+    NodeHash::const_iterator it = _nodeHash.find(uuid);
-        SharedNodePointer matchingNode = _nodeHash.at(uuid);
+    
+    if (it != _nodeHash.end()) {
+        SharedNodePointer& matchingNode = it->second;
         
         matchingNode->setPublicSocket(publicSocket);
         matchingNode->setLocalSocket(localSocket);
         
         return matchingNode;
-    } catch (std::out_of_range) {
+    } else {
         // we didn't have this node, so add them
         Node* newNode = new Node(uuid, nodeType, publicSocket, localSocket);
-        SharedNodePointer newNodeSharedPointer(newNode, &QObject::deleteLater);
+        SharedNodePointer newNodePointer(newNode);
         
-        _nodeHash.insert(UUIDNodePair(newNode->getUUID(), newNodeSharedPointer));
+        _nodeHash.insert(UUIDNodePair(newNode->getUUID(), newNodePointer));
         
         qDebug() << "Added" << *newNode;
         
-        emit nodeAdded(newNodeSharedPointer);
+        emit nodeAdded(newNodePointer);
         
-        return newNodeSharedPointer;
+        return newNodePointer;
     }
 }
 

libraries/networking/src/ResourceCache.cpp

@@ -112,27 +112,30 @@ void ResourceCache::reserveUnusedResource(qint64 resourceSize) {
 }
 
 void ResourceCache::attemptRequest(Resource* resource) {
+    auto sharedItems = DependencyManager::get<ResouceCacheSharedItems>();
     if (_requestLimit <= 0) {
         // wait until a slot becomes available
-        _pendingRequests.append(resource);
+        sharedItems->_pendingRequests.append(resource);
         return;
     }
     _requestLimit--;
-    _loadingRequests.append(resource);
+    sharedItems->_loadingRequests.append(resource);
     resource->makeRequest();
 }
 
 void ResourceCache::requestCompleted(Resource* resource) {
-    _loadingRequests.removeOne(resource);
+    
+    auto sharedItems = DependencyManager::get<ResouceCacheSharedItems>();
+    sharedItems->_loadingRequests.removeOne(resource);
     _requestLimit++;
     
     // look for the highest priority pending request
     int highestIndex = -1;
     float highestPriority = -FLT_MAX;
-    for (int i = 0; i < _pendingRequests.size(); ) {
+    for (int i = 0; i < sharedItems->_pendingRequests.size(); ) {
-        Resource* resource = _pendingRequests.at(i).data();
+        Resource* resource = sharedItems->_pendingRequests.at(i).data();
         if (!resource) {
-            _pendingRequests.removeAt(i);
+            sharedItems->_pendingRequests.removeAt(i);
             continue;
         }
         float priority = resource->getLoadPriority();
@@ -143,16 +146,13 @@ void ResourceCache::requestCompleted(Resource* resource) {
         i++;
     }
     if (highestIndex >= 0) {
-        attemptRequest(_pendingRequests.takeAt(highestIndex));
+        attemptRequest(sharedItems->_pendingRequests.takeAt(highestIndex));
     }
 }
 
 const int DEFAULT_REQUEST_LIMIT = 10;
 int ResourceCache::_requestLimit = DEFAULT_REQUEST_LIMIT;
 
-QList<QPointer<Resource> > ResourceCache::_pendingRequests;
-QList<Resource*> ResourceCache::_loadingRequests;
-
 Resource::Resource(const QUrl& url, bool delayLoad) :
     _url(url),
     _request(url) {
@@ -248,11 +248,7 @@ void Resource::allReferencesCleared() {
         _cache->addUnusedResource(self);
         
     } else {
-#ifndef WIN32
-        // Note to Andrzej this causes a consistent crash on windows/vs2013
-        // patching here as a very temporary workaround.  --craig
         delete this;
-#endif // !WIN32
     }
 }
 

libraries/networking/src/ResourceCache.h

@@ -22,6 +22,8 @@
 #include <QUrl>
 #include <QWeakPointer>
 
+#include <DependencyManager.h>
+
 class QNetworkReply;
 class QTimer;
 
@@ -40,6 +42,21 @@ static const qint64 DEFAULT_UNUSED_MAX_SIZE = 1024 * BYTES_PER_MEGABYTES;
 static const qint64 MIN_UNUSED_MAX_SIZE = 0;
 static const qint64 MAX_UNUSED_MAX_SIZE = 10 * BYTES_PER_GIGABYTES;
 
+// We need to make sure that these items are available for all instances of
+// ResourceCache derived classes. Since we can't count on the ordering of
+// static members destruction, we need to use this Dependency manager implemented
+// object instead
+class ResouceCacheSharedItems : public Dependency  {
+    SINGLETON_DEPENDENCY
+public:
+    QList<QPointer<Resource> > _pendingRequests;
+    QList<Resource*> _loadingRequests;
+private:
+    ResouceCacheSharedItems() { }
+    virtual ~ResouceCacheSharedItems() { }
+};
+
+
 /// Base class for resource caches.
 class ResourceCache : public QObject {
     Q_OBJECT
@@ -51,9 +68,11 @@ public:
     void setUnusedResourceCacheSize(qint64 unusedResourcesMaxSize);
     qint64 getUnusedResourceCacheSize() const { return _unusedResourcesMaxSize; }
 
-    static const QList<Resource*>& getLoadingRequests() { return _loadingRequests; }
+    static const QList<Resource*>& getLoadingRequests() 
+        { return DependencyManager::get<ResouceCacheSharedItems>()->_loadingRequests; }
 
-    static int getPendingRequestCount() { return _pendingRequests.size(); }
+    static int getPendingRequestCount() 
+        { return DependencyManager::get<ResouceCacheSharedItems>()->_pendingRequests.size(); }
 
     ResourceCache(QObject* parent = NULL);
     virtual ~ResourceCache();
@@ -90,8 +109,6 @@ private:
     int _lastLRUKey = 0;
     
     static int _requestLimit;
-    static QList<QPointer<Resource> > _pendingRequests;
-    static QList<Resource*> _loadingRequests;
 };
 
 /// Base class for resources.