Merge branch 'master' into tablet-ui

assignment-client/src/AssignmentClient.cpp

@@ -12,7 +12,6 @@
 #include <assert.h>
 
 #include <QProcess>
-#include <QSettings>
 #include <QSharedMemory>
 #include <QThread>
 #include <QTimer>
@@ -49,8 +48,6 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
 {
     LogUtils::init();
 
-    QSettings::setDefaultFormat(QSettings::IniFormat);
-
     DependencyManager::set<AccountManager>();
 
     auto scriptableAvatar = DependencyManager::set<ScriptableAvatar>();

assignment-client/src/AssignmentClientApp.cpp

@@ -12,7 +12,6 @@
 #include <QCommandLineParser>
 #include <QThread>
 
-#include <BuildInfo.h>
 #include <LogHandler.h>
 #include <SharedUtil.h>
 #include <HifiConfigVariantMap.h>
@@ -40,11 +39,6 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
     ShutdownEventListener::getInstance();
 #   endif
 
-    setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
-    setOrganizationDomain("highfidelity.io");
-    setApplicationName("assignment-client");
-    setApplicationVersion(BuildInfo::VERSION);
-
     // parse command-line
     QCommandLineParser parser;
     parser.setApplicationDescription("High Fidelity Assignment Client");

assignment-client/src/avatars/AvatarMixer.cpp

@@ -32,7 +32,8 @@
 
 const QString AVATAR_MIXER_LOGGING_NAME = "avatar-mixer";
 
-const int AVATAR_MIXER_BROADCAST_FRAMES_PER_SECOND = 60;
+// FIXME - what we'd actually like to do is send to users at ~50% of their present rate down to 30hz. Assume 90 for now.
+const int AVATAR_MIXER_BROADCAST_FRAMES_PER_SECOND = 45;
 const unsigned int AVATAR_DATA_SEND_INTERVAL_MSECS = (1.0f / (float) AVATAR_MIXER_BROADCAST_FRAMES_PER_SECOND) * 1000;
 
 AvatarMixer::AvatarMixer(ReceivedMessage& message) :
@@ -592,7 +593,7 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) {
     const QString AVATAR_MIXER_SETTINGS_KEY = "avatar_mixer";
     const QString NODE_SEND_BANDWIDTH_KEY = "max_node_send_bandwidth";
 
-    const float DEFAULT_NODE_SEND_BANDWIDTH = 1.0f;
+    const float DEFAULT_NODE_SEND_BANDWIDTH = 5.0f;
     QJsonValue nodeBandwidthValue = domainSettings[AVATAR_MIXER_SETTINGS_KEY].toObject()[NODE_SEND_BANDWIDTH_KEY];
     if (!nodeBandwidthValue.isDouble()) {
         qDebug() << NODE_SEND_BANDWIDTH_KEY << "is not a double - will continue with default value";

assignment-client/src/main.cpp

@@ -13,10 +13,16 @@
 #include <SharedUtil.h>
 
 #include "AssignmentClientApp.h"
+#include <BuildInfo.h>
 
 int main(int argc, char* argv[]) {
     disableQtBearerPoll(); // Fixes wifi ping spikes
 
+    QCoreApplication::setApplicationName(BuildInfo::ASSIGNMENT_CLIENT_NAME);
+    QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
+    QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
+    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
+
     qInstallMessageHandler(LogHandler::verboseMessageHandler);
     qInfo() << "Starting.";
 

cmake/macros/TargetKinect.cmake

@@ -0,0 +1,17 @@
+#
+#  Created by Brad Hefta-Gaub on 2016/12/7
+#  Copyright 2016 High Fidelity, Inc.
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+#
+macro(TARGET_KINECT)
+    # Kinect SDK data reader is only available on these platforms
+    if (WIN32)
+        #add_dependency_external_projects(kinect)
+        find_package(Kinect REQUIRED)
+        target_include_directories(${TARGET_NAME} PRIVATE ${KINECT_INCLUDE_DIRS})
+        target_link_libraries(${TARGET_NAME} ${KINECT_LIBRARIES})
+        add_definitions(-DHAVE_KINECT)
+    endif(WIN32)
+endmacro()

cmake/modules/FindKinect.cmake

@@ -0,0 +1,59 @@
+#
+#  FindKinect.cmake
+#
+#  Try to find the Perception Kinect SDK
+#
+#  You must provide a KINECT_ROOT_DIR which contains lib and include directories
+#
+#  Once done this will define
+#
+#  KINECT_FOUND - system found Kinect SDK
+#  KINECT_INCLUDE_DIRS - the Kinect SDK include directory
+#  KINECT_LIBRARIES - Link this to use Kinect
+#
+#  Created by Brad Hefta-Gaub on 2016/12/7
+#  Copyright 2016 High Fidelity, Inc.
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+#
+
+include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
+hifi_library_search_hints("kinect")
+
+find_path(KINECT_INCLUDE_DIRS Kinect.h PATH_SUFFIXES inc HINTS $ENV{KINECT_ROOT_DIR})
+
+if (WIN32)
+
+  if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+      set(ARCH_DIR "x64")
+  else()
+      set(ARCH_DIR "x86")
+  endif()
+
+  find_library(
+        KINECT_LIBRARY_RELEASE Kinect20 
+        PATH_SUFFIXES "Lib/${ARCH_DIR}" "lib" 
+        HINTS ${KINECT_SEARCH_DIRS}
+        PATH $ENV{KINECT_ROOT_DIR})
+
+  set(KINECT_LIBRARIES ${KINECT_LIBRARY})
+
+  # DLL not needed yet??
+  #find_path(KINECT_DLL_PATH Kinect20.Face.dll PATH_SUFFIXES "bin" HINTS ${KINECT_SEARCH_DIRS})
+
+
+endif ()
+
+include(SelectLibraryConfigurations)
+select_library_configurations(KINECT)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(KINECT DEFAULT_MSG KINECT_INCLUDE_DIRS KINECT_LIBRARY)
+
+# DLLs not needed yet
+#if (WIN32)
+#  add_paths_to_fixup_libs(${KINECT_DLL_PATH})
+#endif ()
+
+mark_as_advanced(KINECT_INCLUDE_DIRS KINECT_LIBRARIES KINECT_SEARCH_DIRS)

cmake/templates/BuildInfo.h.in

@@ -1,6 +1,6 @@
 //
 //  BuildInfo.h.in
-//  cmake/macros
+//  cmake/templates
 //
 //  Created by Stephen Birarda on 1/14/16.
 //  Copyright 2015 High Fidelity, Inc.
@@ -11,10 +11,19 @@
 
 #define USE_STABLE_GLOBAL_SERVICES @USE_STABLE_GLOBAL_SERVICES@
 
+#include <QString>
+
 namespace BuildInfo {
+    // WARNING: This file has been auto-generated.
+    // Check cmake/templates/BuildInfo.h.in if you want to modify it.
+
+    const QString INTERFACE_NAME = "Interface";
+    const QString ASSIGNMENT_CLIENT_NAME = "assignment-client";
+    const QString DOMAIN_SERVER_NAME = "domain-server";
+    const QString AC_CLIENT_SERVER_NAME = "ac-client";
     const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@";
+    const QString ORGANIZATION_DOMAIN = "highfidelity.io";
     const QString VERSION = "@BUILD_VERSION@";
     const QString BUILD_BRANCH = "@BUILD_BRANCH@";
     const QString BUILD_GLOBAL_SERVICES = "@BUILD_GLOBAL_SERVICES@";
 }
-

domain-server/resources/describe-settings.json

@@ -1398,8 +1398,8 @@
           "type": "double",
           "label": "Per-Node Bandwidth",
           "help": "Desired maximum send bandwidth (in Megabits per second) to each node",
-          "placeholder": 1.0,
-          "default": 1.0,
+          "placeholder": 5.0,
+          "default": 5.0,
           "advanced": true
         }
       ]

domain-server/src/DomainServer.cpp

@@ -76,14 +76,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     LogUtils::init();
     Setting::init();
 
-    setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
-    setOrganizationDomain("highfidelity.io");
-    setApplicationName("domain-server");
-    setApplicationVersion(BuildInfo::VERSION);
-    QSettings::setDefaultFormat(QSettings::IniFormat);
-
     qDebug() << "Setting up domain-server";
-
     qDebug() << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
     qDebug() << "[VERSION] MODIFIED_ORGANIZATION:" << BuildInfo::MODIFIED_ORGANIZATION;
     qDebug() << "[VERSION] VERSION:" << BuildInfo::VERSION;

domain-server/src/DomainServerSettingsManager.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "DomainServerSettingsManager.h"
+
 #include <algorithm>
 
 #include <QtCore/QCoreApplication>
@@ -16,23 +18,21 @@
 #include <QtCore/QFile>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
-#include <QtCore/QSettings>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QUrl>
 #include <QtCore/QUrlQuery>
-#include <AccountManager.h>
 #include <QTimeZone>
 
+#include <AccountManager.h>
 #include <Assignment.h>
 #include <HifiConfigVariantMap.h>
 #include <HTTPConnection.h>
 #include <NLPacketList.h>
 #include <NumericalConstants.h>
+#include <SettingHandle.h>
 
 #include "DomainServerNodeData.h"
 
-#include "DomainServerSettingsManager.h"
-
 const QString SETTINGS_DESCRIPTION_RELATIVE_PATH = "/resources/describe-settings.json";
 
 const QString DESCRIPTION_SETTINGS_KEY = "settings";
@@ -43,6 +43,8 @@ const QString DESCRIPTION_COLUMNS_KEY = "columns";
 
 const QString SETTINGS_VIEWPOINT_KEY = "viewpoint";
 
+static Setting::Handle<double> JSON_SETTING_VERSION("json-settings/version", 0.0);
+
 DomainServerSettingsManager::DomainServerSettingsManager() :
     _descriptionArray(),
     _configMap()
@@ -103,9 +105,7 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
 
     // What settings version were we before and what are we using now?
     // Do we need to do any re-mapping?
-    QSettings appSettings;
-    const QString JSON_SETTINGS_VERSION_KEY = "json-settings/version";
-    double oldVersion = appSettings.value(JSON_SETTINGS_VERSION_KEY, 0.0).toDouble();
+    double oldVersion = JSON_SETTING_VERSION.get();
 
     if (oldVersion != _descriptionVersion) {
         const QString ALLOWED_USERS_SETTINGS_KEYPATH = "security.allowed_users";
@@ -301,7 +301,7 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
     unpackPermissions();
 
     // write the current description version to our settings
-    appSettings.setValue(JSON_SETTINGS_VERSION_KEY, _descriptionVersion);
+    JSON_SETTING_VERSION.set(_descriptionVersion);
 }
 
 QVariantMap& DomainServerSettingsManager::getDescriptorsMap() {

domain-server/src/DomainServerSettingsManager.h

@@ -14,6 +14,7 @@
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
+#include <QtNetwork/QNetworkReply>
 
 #include <HifiConfigVariantMap.h>
 #include <HTTPManager.h>
@@ -21,6 +22,8 @@
 #include <ReceivedMessage.h>
 #include "NodePermissions.h"
 
+#include <Node.h>
+
 const QString SETTINGS_PATHS_KEY = "paths";
 
 const QString SETTINGS_PATH = "/settings";

domain-server/src/main.cpp

@@ -17,12 +17,18 @@
 
 #include <LogHandler.h>
 #include <SharedUtil.h>
+#include <BuildInfo.h>
 
 #include "DomainServer.h"
 
 int main(int argc, char* argv[]) {
     disableQtBearerPoll(); // Fixes wifi ping spikes
 
+    QCoreApplication::setApplicationName(BuildInfo::DOMAIN_SERVER_NAME);
+    QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
+    QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
+    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
+
 #ifndef WIN32
     setvbuf(stdout, NULL, _IOLBF, 0);
 #endif

interface/CMakeLists.txt

@@ -166,6 +166,7 @@ if (WIN32)
   add_dependency_external_projects(OpenVR)
   add_dependency_external_projects(neuron)
   add_dependency_external_projects(wasapi)
+  add_dependency_external_projects(steamworks)
 endif()
 
 # disable /OPT:REF and /OPT:ICF for the Debug builds
@@ -175,10 +176,6 @@ if (WIN32)
   set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY LINK_FLAGS_DEBUG "/OPT:NOREF /OPT:NOICF")
 endif()
 
-if (NOT ANDROID)
-  set(NON_ANDROID_LIBRARIES steamworks-wrapper)
-endif ()
-
 # link required hifi libraries
 link_hifi_libraries(
   shared octree gpu gl gpu-gl procedural model render

interface/resources/controllers/kinect.json

@@ -0,0 +1,7 @@
+{
+    "name": "Kinect to Standard",
+    "channels": [
+        { "from": "Kinect.LeftHand", "to": "Standard.LeftHand" },
+        { "from": "Kinect.RightHand", "to": "Standard.RightHand" }
+    ]
+}

interface/resources/html/help.html

@@ -47,26 +47,70 @@
             }
         </style>
         <script>
+            var handControllerImageURL = null;
+
             function showKbm() {
                 document.getElementById("main_image").setAttribute("src", "img/controls-help-keyboard.png");
             }
-            function showViveControllers() {
-                document.getElementById("main_image").setAttribute("src", "img/controls-help-vive.png");
+
+            function showHandControllers() {
+                document.getElementById("main_image").setAttribute("src", handControllerImageURL);
             }
-            function showXboxController() {
+
+            function showGamepad() {
                 document.getElementById("main_image").setAttribute("src", "img/controls-help-gamepad.png");
             }
-            function load() {
-                console.log("In help.html: ", window.location.href);
-                parts = window.location.href.split("?");
-                if (parts.length > 0) {
-                    var defaultTab = parts[1];
-                    if (defaultTab == "xbox") {
-                        showXboxController();
-                    } else if (defaultTab == "vive") {
-                        showViveControllers();
+
+            // This is not meant to be a complete or hardened query string parser - it only
+            // needs to handle the values we send in and have control over.
+            //
+            // queryString is a string of the form "key1=value1&key2=value2&key3&key4=value4"
+            function parseQueryString(queryString) {
+                var params = {};
+                var paramsParts = queryString.split("&");
+                for (var i = 0; i < paramsParts.length; ++i) {
+                    var paramKeyValue = paramsParts[i].split("=");
+                    if (paramKeyValue.length == 1) {
+                        params[paramKeyValue[0]] = undefined;
+                    } else if (paramKeyValue.length == 2) {
+                        params[paramKeyValue[0]] = paramKeyValue[1];
+                    } else {
+                        console.error("Error parsing param keyvalue: ", paramParts);
                     }
                 }
+                return params;
+            }
+
+            function load() {
+                var parts = window.location.href.split("?");
+                var params = {};
+                if (parts.length > 0) {
+                    params = parseQueryString(parts[1]);
+                }
+
+                switch (params.handControllerName) {
+                    case "oculus":
+                        handControllerImageURL = "img/controls-help-oculus.png";
+                        break;
+
+                    case "vive":
+                    default:
+                        handControllerImageURL = "img/controls-help-vive.png";
+                }
+
+                switch (params.defaultTab) {
+                    case "gamepad":
+                        showGamepad();
+                        break;
+
+                    case "handControllers":
+                        showHandControllers();
+                        break;
+
+                    case "kbm":
+                    default:
+                        showKbm();
+                }
             }
         </script>
     </head>
@@ -75,8 +119,8 @@
         <div id="image_area">
             <img id="main_image" src="img/controls-help-keyboard.png" width="1024px" height="720px"></img>
             <a href="#" id="kbm_button" onmousedown="showKbm()"></a>
-            <a href="#" id="hand_controllers_button" onmousedown="showViveControllers()"></a>
-            <a href="#" id="game_controller_button" onmousedown="showXboxController()"></a>
+            <a href="#" id="hand_controllers_button" onmousedown="showHandControllers()"></a>
+            <a href="#" id="game_controller_button" onmousedown="showGamepad()"></a>
         </div>
     </body>
 

interface/resources/info/ApplicationInfo.ini

@@ -1,4 +0,0 @@
-[INFO]
-name=Interface
-organizationName=High Fidelity
-organizationDomain=highfidelity.io

interface/resources/qml/Stats.qml

@@ -154,7 +154,8 @@ Item {
                     StatText {
                         visible: root.expanded;
                         text: "Avatar Mixer Out: " + root.avatarMixerOutKbps + " kbps, " +
-                            root.avatarMixerOutPps + "pps";
+                            root.avatarMixerOutPps + "pps, " +
+                            root.myAvatarSendRate.toFixed(2) + "hz";
                     }
                     StatText {
                         visible: root.expanded;

interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml

@@ -17,7 +17,7 @@ PreferencesDialog {
     id: root
     objectName: "GeneralPreferencesDialog"
     title: "General Settings"
-    showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "Sixense Controllers", "Perception Neuron"]
+    showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "Sixense Controllers", "Perception Neuron", "Kinect"]
     property var settings: Settings {
         category: root.objectName
         property alias x: root.x

interface/src/Application.cpp

@@ -90,20 +90,21 @@
 #include <PerfStat.h>
 #include <PhysicsEngine.h>
 #include <PhysicsHelpers.h>
+#include <plugins/CodecPlugin.h>
 #include <plugins/PluginManager.h>
 #include <plugins/PluginUtils.h>
-#include <plugins/CodecPlugin.h>
+#include <plugins/SteamClientPlugin.h>
 #include <RecordingScriptingInterface.h>
 #include <RenderableWebEntityItem.h>
 #include <RenderShadowTask.h>
 #include <RenderDeferredTask.h>
+#include <RenderForwardTask.h>
 #include <ResourceCache.h>
 #include <SandboxUtils.h>
 #include <SceneScriptingInterface.h>
 #include <ScriptEngines.h>
 #include <ScriptCache.h>
 #include <SoundCache.h>
-#include <steamworks-wrapper/SteamClient.h>
 #include <TabletScriptingInterface.h>
 #include <Tooltip.h>
 #include <udt/PacketHeaders.h>
@@ -417,10 +418,11 @@ bool setupEssentials(int& argc, char** argv) {
     const char* portStr = getCmdOption(argc, constArgv, "--listenPort");
     const int listenPort = portStr ? atoi(portStr) : INVALID_PORT;
 
-    // Set build version
-    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
+    Setting::init();
 
-    Setting::preInit();
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        steamClient->init();
+    }
 
 #if defined(Q_OS_WIN)
     // Select appropriate audio DLL
@@ -442,8 +444,6 @@ bool setupEssentials(int& argc, char** argv) {
     DependencyManager::registerInheritance<EntityActionFactoryInterface, InterfaceActionFactory>();
     DependencyManager::registerInheritance<SpatialParentFinder, InterfaceParentFinder>();
 
-    Setting::init();
-
     // Set dependencies
     DependencyManager::set<AccountManager>(std::bind(&Application::getUserAgent, qApp));
     DependencyManager::set<ScriptEngines>();
@@ -553,7 +553,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     _maxOctreePPS(maxOctreePacketsPerSecond.get()),
     _lastFaceTrackerUpdate(0)
 {
-    setProperty(hifi::properties::STEAM, SteamClient::isRunning());
+    auto steamClient = PluginManager::getInstance()->getSteamClientPlugin();
+    setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning()));
     setProperty(hifi::properties::CRASHED, _previousSessionCrashed);
 
     {
@@ -608,7 +609,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     _deadlockWatchdogThread = new DeadlockWatchdogThread();
     _deadlockWatchdogThread->start();
 
-    qCDebug(interfaceapp) << "[VERSION] SteamVR buildID:" << SteamClient::getSteamVRBuildID();
+    if (steamClient) {
+        qCDebug(interfaceapp) << "[VERSION] SteamVR buildID:" << steamClient->getSteamVRBuildID();
+    }
     qCDebug(interfaceapp) << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
     qCDebug(interfaceapp) << "[VERSION] MODIFIED_ORGANIZATION:" << BuildInfo::MODIFIED_ORGANIZATION;
     qCDebug(interfaceapp) << "[VERSION] VERSION:" << BuildInfo::VERSION;
@@ -1702,6 +1705,10 @@ Application::~Application() {
 
     Leapmotion::destroy();
 
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        steamClient->shutdown();
+    }
+
 #if 0
     ConnexionClient::getInstance().destroy();
 #endif
@@ -1746,10 +1753,14 @@ void Application::initializeGL() {
     // Set up the render engine
     render::CullFunctor cullFunctor = LODManager::shouldRender;
     _renderEngine->addJob<RenderShadowTask>("RenderShadowTask", cullFunctor);
-    _renderEngine->addJob<RenderDeferredTask>("RenderDeferredTask", cullFunctor);
+    static const QString RENDER_FORWARD = "RENDER_FORWARD";
+    if (QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD)) {
+        _renderEngine->addJob<RenderForwardTask>("RenderForwardTask", cullFunctor);
+    } else {
+        _renderEngine->addJob<RenderDeferredTask>("RenderDeferredTask", cullFunctor);
+    }
     _renderEngine->load();
     _renderEngine->registerScene(_main3DScene);
-    // TODO: Load a cached config file
 
     // The UI can't be created until the primary OpenGL
     // context is created, because it needs to share
@@ -1881,8 +1892,10 @@ void Application::initializeUi() {
 
     rootContext->setContextProperty("ApplicationCompositor", &getApplicationCompositor());
 
-    rootContext->setContextProperty("Steam", new SteamScriptingInterface(engine));
-    
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        rootContext->setContextProperty("Steam", new SteamScriptingInterface(engine, steamClient.get()));
+    }
+
 
     _glWidget->installEventFilter(offscreenUi.data());
     offscreenUi->setMouseTranslator([=](const QPointF& pt) {
@@ -2220,17 +2233,31 @@ void Application::aboutApp() {
 }
 
 void Application::showHelp() {
-    static const QString QUERY_STRING_XBOX = "xbox";
-    static const QString QUERY_STRING_VIVE = "vive";
+    static const QString HAND_CONTROLLER_NAME_VIVE = "vive";
+    static const QString HAND_CONTROLLER_NAME_OCULUS_TOUCH = "oculus";
+
+    static const QString TAB_KEYBOARD_MOUSE = "kbm";
+    static const QString TAB_GAMEPAD = "gamepad";
+    static const QString TAB_HAND_CONTROLLERS = "handControllers";
+
+    QString handControllerName = HAND_CONTROLLER_NAME_VIVE;
+    QString defaultTab = TAB_KEYBOARD_MOUSE;
 
-    QString queryString = "";
     if (PluginUtils::isViveControllerAvailable()) {
-        queryString = QUERY_STRING_VIVE;
+        defaultTab = TAB_HAND_CONTROLLERS;
+        handControllerName = HAND_CONTROLLER_NAME_VIVE;
+    } else if (PluginUtils::isOculusTouchControllerAvailable()) {
+        defaultTab = TAB_HAND_CONTROLLERS;
+        handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH;
     } else if (PluginUtils::isXboxControllerAvailable()) {
-        queryString = QUERY_STRING_XBOX;
+        defaultTab = TAB_GAMEPAD;
     }
 
-    InfoView::show(INFO_HELP_PATH, false, queryString);
+    QUrlQuery queryString;
+    queryString.addQueryItem("handControllerName", handControllerName);
+    queryString.addQueryItem("defaultTab", defaultTab);
+
+    InfoView::show(INFO_HELP_PATH, false, queryString.toString());
 }
 
 void Application::resizeEvent(QResizeEvent* event) {
@@ -3194,7 +3221,9 @@ void Application::idle(float nsecsElapsed) {
 
     PROFILE_RANGE(__FUNCTION__);
 
-    SteamClient::runCallbacks();
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        steamClient->runCallbacks();
+    }
 
     float secondsSinceLastUpdate = nsecsElapsed / NSECS_PER_MSEC / MSECS_PER_SECOND;
 
@@ -3526,12 +3555,16 @@ void Application::init() {
 
     _timerStart.start();
     _lastTimeUpdated.start();
-    // when +connect_lobby in command line, join steam lobby
-    const QString STEAM_LOBBY_COMMAND_LINE_KEY = "+connect_lobby";
-    int lobbyIndex = arguments().indexOf(STEAM_LOBBY_COMMAND_LINE_KEY);
-    if (lobbyIndex != -1) {
-        QString lobbyId = arguments().value(lobbyIndex + 1);
-        SteamClient::joinLobby(lobbyId);
+
+
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        // when +connect_lobby in command line, join steam lobby
+        const QString STEAM_LOBBY_COMMAND_LINE_KEY = "+connect_lobby";
+        int lobbyIndex = arguments().indexOf(STEAM_LOBBY_COMMAND_LINE_KEY);
+        if (lobbyIndex != -1) {
+            QString lobbyId = arguments().value(lobbyIndex + 1);
+            steamClient->joinLobby(lobbyId);
+        }
     }
 
 
@@ -5186,8 +5219,9 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
     scriptEngine->registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
     scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data());
 
-    scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptEngine));
-
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptEngine, steamClient.get()));
+    }
     auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();
     scriptEngine->registerGlobalObject("Controller", scriptingInterface.data());
     UserInputMapper::registerControllerTypes(scriptEngine);

interface/src/CrashHandler.cpp

@@ -18,19 +18,18 @@
 #include <QLabel>
 #include <PathUtils.h>
 #include <QRadioButton>
-#include <QSettings>
 #include <QStandardPaths>
 #include <QVBoxLayout>
 #include <QtCore/QUrl>
 
 #include "Application.h"
 #include "Menu.h"
+#include <SettingHandle.h>
 
 #include <RunningMarker.h>
 
 bool CrashHandler::checkForResetSettings(bool suppressPrompt) {
-    QSettings::setDefaultFormat(QSettings::IniFormat);
-    QSettings settings;
+    Settings settings;
     settings.beginGroup("Developer");
     QVariant displayCrashOptions = settings.value(MenuOption::DisplayCrashOptions);
     QVariant askToResetSettingsOption = settings.value(MenuOption::AskToResetSettings);
@@ -110,8 +109,7 @@ void CrashHandler::handleCrash(CrashHandler::Action action) {
         return;
     }
 
-    QSettings::setDefaultFormat(QSettings::IniFormat);
-    QSettings settings;
+    Settings settings;
     const QString ADDRESS_MANAGER_GROUP = "AddressManager";
     const QString ADDRESS_KEY = "address";
     const QString AVATAR_GROUP = "Avatar";

interface/src/DiscoverabilityManager.cpp

@@ -15,7 +15,8 @@
 #include <AddressManager.h>
 #include <DomainHandler.h>
 #include <NodeList.h>
-#include <steamworks-wrapper/SteamClient.h>
+#include <plugins/PluginManager.h>
+#include <plugins/SteamClientPlugin.h>
 #include <UserActivityLogger.h>
 #include <UUID.h>
 
@@ -111,7 +112,9 @@ void DiscoverabilityManager::updateLocation() {
     }
 
     // Update Steam
-    SteamClient::updateLocation(domainHandler.getHostname(), addressManager->currentFacingShareableAddress());
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        steamClient->updateLocation(domainHandler.getHostname(), addressManager->currentFacingShareableAddress());
+    }
 }
 
 void DiscoverabilityManager::handleHeartbeatResponse(QNetworkReply& requestReply) {

interface/src/Util.h

@@ -14,7 +14,6 @@
 
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
-#include <QSettings>
 
 #include <gpu/Batch.h>
 

interface/src/avatar/AvatarManager.cpp

@@ -41,9 +41,11 @@
 #include "MyAvatar.h"
 #include "SceneScriptingInterface.h"
 
-// 70 times per second - target is 60hz, but this helps account for any small deviations
-// in the update loop
-static const quint64 MIN_TIME_BETWEEN_MY_AVATAR_DATA_SENDS = (1000 * 1000) / 70;
+// 50 times per second - target is 45hz, but this helps account for any small deviations
+// in the update loop - this also results in ~30hz when in desktop mode which is essentially
+// what we want
+const int CLIENT_TO_AVATAR_MIXER_BROADCAST_FRAMES_PER_SECOND = 50;
+static const quint64 MIN_TIME_BETWEEN_MY_AVATAR_DATA_SENDS = USECS_PER_SECOND / CLIENT_TO_AVATAR_MIXER_BROADCAST_FRAMES_PER_SECOND;
 
 // We add _myAvatar into the hash with all the other AvatarData, and we use the default NULL QUid as the key.
 const QUuid MY_AVATAR_KEY;  // NULL key
@@ -118,6 +120,7 @@ void AvatarManager::updateMyAvatar(float deltaTime) {
         PerformanceTimer perfTimer("send");
         _myAvatar->sendAvatarDataPacket();
         _lastSendAvatarDataTime = now;
+        _myAvatarSendRate.increment();
     }
 }
 

interface/src/avatar/AvatarManager.h

@@ -20,6 +20,7 @@
 #include <PhysicsEngine.h>
 #include <PIDController.h>
 #include <SimpleMovingAverage.h>
+#include <shared/RateCounter.h>
 
 #include "Avatar.h"
 #include "AvatarMotionState.h"
@@ -74,6 +75,8 @@ public:
                                                                   const QScriptValue& avatarIdsToInclude = QScriptValue(),
                                                                   const QScriptValue& avatarIdsToDiscard = QScriptValue());
 
+    float getMyAvatarSendRate() const { return _myAvatarSendRate.rate(); }
+
 public slots:
     void setShouldShowReceiveStats(bool shouldShowReceiveStats) { _shouldShowReceiveStats = shouldShowReceiveStats; }
     void updateAvatarRenderStatus(bool shouldRenderAvatars);
@@ -106,6 +109,9 @@ private:
     SetOfAvatarMotionStates _motionStatesThatMightUpdate;
     SetOfMotionStates _motionStatesToAddToPhysics;
     VectorOfMotionStates _motionStatesToRemoveFromPhysics;
+
+    RateCounter<> _myAvatarSendRate;
+
 };
 
 Q_DECLARE_METATYPE(AvatarManager::LocalLight)

interface/src/avatar/MyAvatar.cpp

@@ -57,7 +57,6 @@
 
 using namespace std;
 
-const glm::vec3 DEFAULT_UP_DIRECTION(0.0f, 1.0f, 0.0f);
 const float DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES = 30.0f;
 
 const float MAX_WALKING_SPEED = 2.6f; // human walking speed

interface/src/main.cpp

@@ -15,14 +15,13 @@
 #include <QDir>
 #include <QLocalSocket>
 #include <QLocalServer>
-#include <QSettings>
 #include <QSharedMemory>
 #include <QTranslator>
 
+#include <BuildInfo.h>
 #include <gl/OpenGLVersionChecker.h>
 #include <SharedUtil.h>
 
-#include <steamworks-wrapper/SteamClient.h>
 
 #include "AddressManager.h"
 #include "Application.h"
@@ -32,7 +31,6 @@
 #include <QtCore/QProcess>
 
 #ifdef HAS_BUGSPLAT
-#include <BuildInfo.h>
 #include <BugSplat.h>
 #include <CrashReporter.h>
 #endif
@@ -51,7 +49,13 @@ int main(int argc, const char* argv[]) {
 #endif
 
     disableQtBearerPoll(); // Fixes wifi ping spikes
-    
+
+    // Set application infos
+    QCoreApplication::setApplicationName(BuildInfo::INTERFACE_NAME);
+    QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
+    QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
+    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
+
     QString applicationName = "High Fidelity Interface - " + qgetenv("USERNAME");
 
     bool instanceMightBeRunning = true;
@@ -129,8 +133,10 @@ int main(int argc, const char* argv[]) {
     }
 
     QCommandLineParser parser;
+    QCommandLineOption checkMinSpecOption("checkMinSpec", "Check if machine meets minimum specifications");
     QCommandLineOption runServerOption("runServer", "Whether to run the server");
     QCommandLineOption serverContentPathOption("serverContentPath", "Where to find server content", "serverContentPath");
+    parser.addOption(checkMinSpecOption);
     parser.addOption(runServerOption);
     parser.addOption(serverContentPathOption);
     parser.parse(arguments);
@@ -157,11 +163,9 @@ int main(int argc, const char* argv[]) {
     // or in the main window ctor, before GL startup.
     Application::initPlugins(arguments);
 
-    SteamClient::init();
-
 #ifdef Q_OS_WIN
     // If we're running in steam mode, we need to do an explicit check to ensure we're up to the required min spec
-    if (SteamClient::isRunning()) {
+    if (parser.isSet(checkMinSpecOption)) {
         QString appPath;
         {
             char filename[MAX_PATH];
@@ -183,7 +187,6 @@ int main(int argc, const char* argv[]) {
 
     int exitCode;
     {
-        QSettings::setDefaultFormat(QSettings::IniFormat);
         Application app(argc, const_cast<char**>(argv), startupTime, runServer, serverContentPathOptionValue);
 
         // If we failed the OpenGLVersion check, log it.
@@ -245,8 +248,6 @@ int main(int argc, const char* argv[]) {
 
     Application::shutdownPlugins();
 
-    SteamClient::shutdown();
-
     qCDebug(interfaceapp, "Normal exit.");
 #if !defined(DEBUG) && !defined(Q_OS_LINUX)
     // HACK: exit immediately (don't handle shutdown callbacks) for Release build

interface/src/ui/LoginDialog.cpp

@@ -17,7 +17,8 @@
 #include <QtNetwork/QNetworkReply>
 
 #include <NetworkingConstants.h>
-#include <steamworks-wrapper/SteamClient.h>
+#include <plugins/PluginManager.h>
+#include <plugins/SteamClientPlugin.h>
 
 #include "AccountManager.h"
 #include "DependencyManager.h"
@@ -56,7 +57,8 @@ void LoginDialog::toggleAction() {
 }
 
 bool LoginDialog::isSteamRunning() const {
-    return SteamClient::isRunning();
+    auto steamClient = PluginManager::getInstance()->getSteamClientPlugin();
+    return steamClient && steamClient->isRunning();
 }
 
 void LoginDialog::login(const QString& username, const QString& password) const {
@@ -66,69 +68,75 @@ void LoginDialog::login(const QString& username, const QString& password) const
 
 void LoginDialog::loginThroughSteam() {
     qDebug() << "Attempting to login through Steam";
-    SteamClient::requestTicket([this](Ticket ticket) {
-        if (ticket.isNull()) {
-            emit handleLoginFailed();
-            return;
-        }
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        steamClient->requestTicket([this](Ticket ticket) {
+            if (ticket.isNull()) {
+                emit handleLoginFailed();
+                return;
+            }
 
-        DependencyManager::get<AccountManager>()->requestAccessTokenWithSteam(ticket);
-    });
+            DependencyManager::get<AccountManager>()->requestAccessTokenWithSteam(ticket);
+        });
+    }
 }
 
 void LoginDialog::linkSteam() {
     qDebug() << "Attempting to link Steam account";
-    SteamClient::requestTicket([this](Ticket ticket) {
-        if (ticket.isNull()) {
-            emit handleLoginFailed();
-            return;
-        }
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        steamClient->requestTicket([this](Ticket ticket) {
+            if (ticket.isNull()) {
+                emit handleLoginFailed();
+                return;
+            }
 
-        JSONCallbackParameters callbackParams;
-        callbackParams.jsonCallbackReceiver = this;
-        callbackParams.jsonCallbackMethod = "linkCompleted";
-        callbackParams.errorCallbackReceiver = this;
-        callbackParams.errorCallbackMethod = "linkFailed";
+            JSONCallbackParameters callbackParams;
+            callbackParams.jsonCallbackReceiver = this;
+            callbackParams.jsonCallbackMethod = "linkCompleted";
+            callbackParams.errorCallbackReceiver = this;
+            callbackParams.errorCallbackMethod = "linkFailed";
 
-        const QString LINK_STEAM_PATH = "api/v1/user/steam/link";
+            const QString LINK_STEAM_PATH = "api/v1/user/steam/link";
 
-        QJsonObject payload;
-        payload.insert("steam_auth_ticket", QJsonValue::fromVariant(QVariant(ticket)));
+            QJsonObject payload;
+            payload.insert("steam_auth_ticket", QJsonValue::fromVariant(QVariant(ticket)));
 
-        auto accountManager = DependencyManager::get<AccountManager>();
-        accountManager->sendRequest(LINK_STEAM_PATH, AccountManagerAuth::Required,
-                                    QNetworkAccessManager::PostOperation, callbackParams,
-                                    QJsonDocument(payload).toJson());
-    });
+            auto accountManager = DependencyManager::get<AccountManager>();
+            accountManager->sendRequest(LINK_STEAM_PATH, AccountManagerAuth::Required,
+                                        QNetworkAccessManager::PostOperation, callbackParams,
+                                        QJsonDocument(payload).toJson());
+        });
+    }
 }
 
 void LoginDialog::createAccountFromStream(QString username) {
     qDebug() << "Attempting to create account from Steam info";
-    SteamClient::requestTicket([this, username](Ticket ticket) {
-        if (ticket.isNull()) {
-            emit handleLoginFailed();
-            return;
-        }
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        steamClient->requestTicket([this, username](Ticket ticket) {
+            if (ticket.isNull()) {
+                emit handleLoginFailed();
+                return;
+            }
 
-        JSONCallbackParameters callbackParams;
-        callbackParams.jsonCallbackReceiver = this;
-        callbackParams.jsonCallbackMethod = "createCompleted";
-        callbackParams.errorCallbackReceiver = this;
-        callbackParams.errorCallbackMethod = "createFailed";
+            JSONCallbackParameters callbackParams;
+            callbackParams.jsonCallbackReceiver = this;
+            callbackParams.jsonCallbackMethod = "createCompleted";
+            callbackParams.errorCallbackReceiver = this;
+            callbackParams.errorCallbackMethod = "createFailed";
 
-        const QString CREATE_ACCOUNT_FROM_STEAM_PATH = "api/v1/user/steam/create";
+            const QString CREATE_ACCOUNT_FROM_STEAM_PATH = "api/v1/user/steam/create";
 
-        QJsonObject payload;
-        payload.insert("steam_auth_ticket", QJsonValue::fromVariant(QVariant(ticket)));
-        if (!username.isEmpty()) {
-            payload.insert("username", QJsonValue::fromVariant(QVariant(username)));
-        }
+            QJsonObject payload;
+            payload.insert("steam_auth_ticket", QJsonValue::fromVariant(QVariant(ticket)));
+            if (!username.isEmpty()) {
+                payload.insert("username", QJsonValue::fromVariant(QVariant(username)));
+            }
 
-        auto accountManager = DependencyManager::get<AccountManager>();
-        accountManager->sendRequest(CREATE_ACCOUNT_FROM_STEAM_PATH, AccountManagerAuth::None,
-                                    QNetworkAccessManager::PostOperation, callbackParams,
-                                    QJsonDocument(payload).toJson());
-    });
+            auto accountManager = DependencyManager::get<AccountManager>();
+            accountManager->sendRequest(CREATE_ACCOUNT_FROM_STEAM_PATH, AccountManagerAuth::None,
+                                        QNetworkAccessManager::PostOperation, callbackParams,
+                                        QJsonDocument(payload).toJson());
+        });
+    }
 
 }
 

interface/src/ui/PreferencesDialog.cpp

@@ -292,23 +292,24 @@ void setupPreferences() {
     {
         static const QString RENDER("Graphics");
         auto renderConfig = qApp->getRenderEngine()->getConfiguration();
+        if (renderConfig) {
+            auto ambientOcclusionConfig = renderConfig->getConfig<AmbientOcclusionEffect>();
+            if (ambientOcclusionConfig) {
+                auto getter = [ambientOcclusionConfig]()->QString { return ambientOcclusionConfig->getPreset(); };
+                auto setter = [ambientOcclusionConfig](QString preset) { ambientOcclusionConfig->setPreset(preset); };
+                auto preference = new ComboBoxPreference(RENDER, "Ambient occlusion", getter, setter);
+                preference->setItems(ambientOcclusionConfig->getPresetList());
+                preferences->addPreference(preference);
+            }
 
-        auto ambientOcclusionConfig = renderConfig->getConfig<AmbientOcclusionEffect>();
-        {
-            auto getter = [ambientOcclusionConfig]()->QString { return ambientOcclusionConfig->getPreset(); };
-            auto setter = [ambientOcclusionConfig](QString preset) { ambientOcclusionConfig->setPreset(preset); };
-            auto preference = new ComboBoxPreference(RENDER, "Ambient occlusion", getter, setter);
-            preference->setItems(ambientOcclusionConfig->getPresetList());
-            preferences->addPreference(preference);
-        }
-
-        auto shadowConfig = renderConfig->getConfig<RenderShadowTask>();
-        {
-            auto getter = [shadowConfig]()->QString { return shadowConfig->getPreset(); };
-            auto setter = [shadowConfig](QString preset) { shadowConfig->setPreset(preset); };
-            auto preference = new ComboBoxPreference(RENDER, "Shadows", getter, setter);
-            preference->setItems(shadowConfig->getPresetList());
-            preferences->addPreference(preference);
+            auto shadowConfig = renderConfig->getConfig<RenderShadowTask>();
+            if (shadowConfig) {
+                auto getter = [shadowConfig]()->QString { return shadowConfig->getPreset(); };
+                auto setter = [shadowConfig](QString preset) { shadowConfig->setPreset(preset); };
+                auto preference = new ComboBoxPreference(RENDER, "Shadows", getter, setter);
+                preference->setItems(shadowConfig->getPresetList());
+                preferences->addPreference(preference);
+            }
         }
     }
     {

interface/src/ui/SnapshotAnimated.cpp

@@ -55,10 +55,6 @@ void SnapshotAnimated::saveSnapshotAnimated(QString pathStill, float aspectRatio
         // Start the snapshotAnimatedTimer QTimer - argument for this is in milliseconds
         SnapshotAnimated::snapshotAnimatedTimerRunning = true;
         SnapshotAnimated::snapshotAnimatedTimer->start(SNAPSNOT_ANIMATED_FRAME_DELAY_MSEC);
-    // If we're already in the middle of capturing an animated snapshot...
-    } else {
-        // Just tell the dependency manager that the capture of the still snapshot has taken place.
-        emit dm->snapshotTaken(pathStill, "", false);
     }
 }
 
@@ -88,9 +84,6 @@ void SnapshotAnimated::captureFrames() {
             // If that was the last frame...
             if ((SnapshotAnimated::snapshotAnimatedTimestamp - SnapshotAnimated::snapshotAnimatedFirstFrameTimestamp) >= (SnapshotAnimated::snapshotAnimatedDuration.get() * MSECS_PER_SECOND)) {
                 SnapshotAnimated::snapshotAnimatedTimerRunning = false;
-                // Reset the current frame timestamp
-                SnapshotAnimated::snapshotAnimatedTimestamp = 0;
-                SnapshotAnimated::snapshotAnimatedFirstFrameTimestamp = 0;
 
                 // Notify the user that we're processing the snapshot
                 emit SnapshotAnimated::snapshotAnimatedDM->processingGif();
@@ -136,7 +129,10 @@ void SnapshotAnimated::processFrames() {
     SnapshotAnimated::snapshotAnimatedFrameVector.squeeze();
     SnapshotAnimated::snapshotAnimatedFrameDelayVector.clear();
     SnapshotAnimated::snapshotAnimatedFrameDelayVector.squeeze();
+    // Reset the current frame timestamp
+    SnapshotAnimated::snapshotAnimatedTimestamp = 0;
+    SnapshotAnimated::snapshotAnimatedFirstFrameTimestamp = 0;
 
-    // Let the dependency manager know that the snapshots have been taken.
+    // Let the window scripting interface know that the snapshots have been taken.
     emit SnapshotAnimated::snapshotAnimatedDM->snapshotTaken(SnapshotAnimated::snapshotStillPath, SnapshotAnimated::snapshotAnimatedPath, false);
 }

interface/src/ui/Stats.cpp

@@ -188,11 +188,13 @@ void Stats::updateStats(bool force) {
             STAT_UPDATE(avatarMixerInPps, roundf(bandwidthRecorder->getAverageInputPacketsPerSecond(NodeType::AvatarMixer)));
             STAT_UPDATE(avatarMixerOutKbps, roundf(bandwidthRecorder->getAverageOutputKilobitsPerSecond(NodeType::AvatarMixer)));
             STAT_UPDATE(avatarMixerOutPps, roundf(bandwidthRecorder->getAverageOutputPacketsPerSecond(NodeType::AvatarMixer)));
+            STAT_UPDATE(myAvatarSendRate, avatarManager->getMyAvatarSendRate());
         } else {
             STAT_UPDATE(avatarMixerInKbps, -1);
             STAT_UPDATE(avatarMixerInPps, -1);
             STAT_UPDATE(avatarMixerOutKbps, -1);
             STAT_UPDATE(avatarMixerOutPps, -1);
+            STAT_UPDATE(myAvatarSendRate, avatarManager->getMyAvatarSendRate());
         }
         SharedNodePointer audioMixerNode = nodeList->soloNodeOfType(NodeType::AudioMixer);
         if (audioMixerNode || force) {

interface/src/ui/Stats.h

@@ -62,6 +62,7 @@ class Stats : public QQuickItem {
     STATS_PROPERTY(int, avatarMixerInPps, 0)
     STATS_PROPERTY(int, avatarMixerOutKbps, 0)
     STATS_PROPERTY(int, avatarMixerOutPps, 0)
+    STATS_PROPERTY(float, myAvatarSendRate, 0)
     STATS_PROPERTY(int, audioMixerKbps, 0)
     STATS_PROPERTY(int, audioMixerPps, 0)
     STATS_PROPERTY(int, downloads, 0)
@@ -164,6 +165,7 @@ signals:
     void avatarMixerInPpsChanged();
     void avatarMixerOutKbpsChanged();
     void avatarMixerOutPpsChanged();
+    void myAvatarSendRateChanged();
     void audioMixerKbpsChanged();
     void audioMixerPpsChanged();
     void downloadsChanged();

libraries/animation/src/Rig.cpp

@@ -973,10 +973,6 @@ void Rig::updateFromEyeParameters(const EyeParameters& params) {
                    params.worldHeadOrientation, params.eyeLookAt, params.eyeSaccade);
 }
 
-static const glm::vec3 X_AXIS(1.0f, 0.0f, 0.0f);
-static const glm::vec3 Y_AXIS(0.0f, 1.0f, 0.0f);
-static const glm::vec3 Z_AXIS(0.0f, 0.0f, 1.0f);
-
 void Rig::computeHeadNeckAnimVars(const AnimPose& hmdPose, glm::vec3& headPositionOut, glm::quat& headOrientationOut,
                                   glm::vec3& neckPositionOut, glm::quat& neckOrientationOut) const {
 

libraries/audio/src/AudioInjector.cpp

@@ -278,6 +278,12 @@ int64_t AudioInjector::injectNextFrame() {
             audioPacketStream.writeRawData(reinterpret_cast<const char*>(&_options.orientation),
                                            sizeof(_options.orientation));
 
+            audioPacketStream.writeRawData(reinterpret_cast<const char*>(&_options.position),
+                sizeof(_options.position));
+            glm::vec3 boxCorner = glm::vec3(0);
+            audioPacketStream.writeRawData(reinterpret_cast<const char*>(&boxCorner),
+                sizeof(glm::vec3));
+
             // pack zero for radius
             float radius = 0;
             audioPacketStream << radius;

libraries/audio/src/Sound.cpp

@@ -195,8 +195,10 @@ struct RIFFHeader {
     char        type[4];        // "WAVE"
 };
 
-struct WAVEHeader {
-    chunk       descriptor;
+static const int WAVEFORMAT_PCM = 1;
+static const int WAVEFORMAT_EXTENSIBLE = 0xfffe;
+
+struct WAVEFormat {
     quint16     audioFormat;    // Format type: 1=PCM, 257=Mu-Law, 258=A-Law, 259=ADPCM
     quint16     numChannels;    // Number of channels: 1=mono, 2=stereo
     quint32     sampleRate;
@@ -205,90 +207,94 @@ struct WAVEHeader {
     quint16     bitsPerSample;
 };
 
-struct DATAHeader {
-    chunk       descriptor;
-};
-
-struct CombinedHeader {
-    RIFFHeader  riff;
-    WAVEHeader  wave;
-};
-
 // returns wavfile sample rate, used for resampling
 int Sound::interpretAsWav(const QByteArray& inputAudioByteArray, QByteArray& outputAudioByteArray) {
 
-    CombinedHeader fileHeader;
-
     // Create a data stream to analyze the data
     QDataStream waveStream(const_cast<QByteArray *>(&inputAudioByteArray), QIODevice::ReadOnly);
-    if (waveStream.readRawData(reinterpret_cast<char *>(&fileHeader), sizeof(CombinedHeader)) == sizeof(CombinedHeader)) {
 
-        if (strncmp(fileHeader.riff.descriptor.id, "RIFF", 4) == 0) {
-            waveStream.setByteOrder(QDataStream::LittleEndian);
-        } else {
-            // descriptor.id == "RIFX" also signifies BigEndian file
-            // waveStream.setByteOrder(QDataStream::BigEndian);
-            qCDebug(audio) << "Currently not supporting big-endian audio files.";
-            return 0;
-        }
-
-        if (strncmp(fileHeader.riff.type, "WAVE", 4) != 0
-            || strncmp(fileHeader.wave.descriptor.id, "fmt", 3) != 0) {
-            qCDebug(audio) << "Not a WAVE Audio file.";
-            return 0;
-        }
-
-        // added the endianess check as an extra level of security
-
-        if (qFromLittleEndian<quint16>(fileHeader.wave.audioFormat) != 1) {
-            qCDebug(audio) << "Currently not supporting non PCM audio files.";
-            return 0;
-        }
-        if (qFromLittleEndian<quint16>(fileHeader.wave.numChannels) == 2) {
-            _isStereo = true;
-        } else if (qFromLittleEndian<quint16>(fileHeader.wave.numChannels) == 4) {
-            _isAmbisonic = true;
-        } else if (qFromLittleEndian<quint16>(fileHeader.wave.numChannels) != 1) {
-            qCDebug(audio) << "Currently not support audio files with other than 1/2/4 channels.";
-            return 0;
-        }
-
-        if (qFromLittleEndian<quint16>(fileHeader.wave.bitsPerSample) != 16) {
-            qCDebug(audio) << "Currently not supporting non 16bit audio files.";
-            return 0;
-        }
-        
-        // Skip any extra data in the WAVE chunk
-        waveStream.skipRawData(fileHeader.wave.descriptor.size - (sizeof(WAVEHeader) - sizeof(chunk)));
-
-        // Read off remaining header information
-        DATAHeader dataHeader;
-        while (true) {
-            // Read chunks until the "data" chunk is found
-            if (waveStream.readRawData(reinterpret_cast<char *>(&dataHeader), sizeof(DATAHeader)) == sizeof(DATAHeader)) {
-                if (strncmp(dataHeader.descriptor.id, "data", 4) == 0) {
-                    break;
-                }
-                waveStream.skipRawData(dataHeader.descriptor.size);
-            } else {
-                qCDebug(audio) << "Could not read wav audio data header.";
-                return 0;
-            }
-        }
-
-        // Now pull out the data
-        quint32 outputAudioByteArraySize = qFromLittleEndian<quint32>(dataHeader.descriptor.size);
-        outputAudioByteArray.resize(outputAudioByteArraySize);
-        if (waveStream.readRawData(outputAudioByteArray.data(), outputAudioByteArraySize) != (int)outputAudioByteArraySize) {
-            qCDebug(audio) << "Error reading WAV file";
-            return 0;
-        }
-
-        _duration = (float) (outputAudioByteArraySize / (fileHeader.wave.sampleRate * fileHeader.wave.numChannels * fileHeader.wave.bitsPerSample / 8.0f));
-        return fileHeader.wave.sampleRate;
-
-    } else {
-        qCDebug(audio) << "Could not read wav audio file header.";
+    // Read the "RIFF" chunk
+    RIFFHeader riff;
+    if (waveStream.readRawData((char*)&riff, sizeof(RIFFHeader)) != sizeof(RIFFHeader)) {
+        qCDebug(audio) << "Not a valid WAVE file.";
         return 0;
     }
+
+    // Parse the "RIFF" chunk
+    if (strncmp(riff.descriptor.id, "RIFF", 4) == 0) {
+        waveStream.setByteOrder(QDataStream::LittleEndian);
+    } else {
+        qCDebug(audio) << "Currently not supporting big-endian audio files.";
+        return 0;
+    }
+    if (strncmp(riff.type, "WAVE", 4) != 0) {
+        qCDebug(audio) << "Not a valid WAVE file.";
+        return 0;
+    }
+
+    // Read chunks until the "fmt " chunk is found
+    chunk fmt;
+    while (true) {
+        if (waveStream.readRawData((char*)&fmt, sizeof(chunk)) != sizeof(chunk)) {
+            qCDebug(audio) << "Not a valid WAVE file.";
+            return 0;
+        }
+        if (strncmp(fmt.id, "fmt ", 4) == 0) {
+            break;
+        }
+        waveStream.skipRawData(qFromLittleEndian<quint32>(fmt.size));   // next chunk
+    }
+
+    // Read the "fmt " chunk
+    WAVEFormat wave;
+    if (waveStream.readRawData((char*)&wave, sizeof(WAVEFormat)) != sizeof(WAVEFormat)) {
+        qCDebug(audio) << "Not a valid WAVE file.";
+        return 0;
+    }
+
+    // Parse the "fmt " chunk
+    if (qFromLittleEndian<quint16>(wave.audioFormat) != WAVEFORMAT_PCM &&
+        qFromLittleEndian<quint16>(wave.audioFormat) != WAVEFORMAT_EXTENSIBLE) {
+        qCDebug(audio) << "Currently not supporting non PCM audio files.";
+        return 0;
+    }
+    if (qFromLittleEndian<quint16>(wave.numChannels) == 2) {
+        _isStereo = true;
+    } else if (qFromLittleEndian<quint16>(wave.numChannels) == 4) {
+        _isAmbisonic = true;
+    } else if (qFromLittleEndian<quint16>(wave.numChannels) != 1) {
+        qCDebug(audio) << "Currently not supporting audio files with other than 1/2/4 channels.";
+        return 0;
+    }
+    if (qFromLittleEndian<quint16>(wave.bitsPerSample) != 16) {
+        qCDebug(audio) << "Currently not supporting non 16bit audio files.";
+        return 0;
+    }
+
+    // Skip any extra data in the "fmt " chunk
+    waveStream.skipRawData(qFromLittleEndian<quint32>(fmt.size) - sizeof(WAVEFormat));
+
+    // Read chunks until the "data" chunk is found
+    chunk data;
+    while (true) {
+        if (waveStream.readRawData((char*)&data, sizeof(chunk)) != sizeof(chunk)) {
+            qCDebug(audio) << "Not a valid WAVE file.";
+            return 0;
+        }
+        if (strncmp(data.id, "data", 4) == 0) {
+            break;
+        }
+        waveStream.skipRawData(qFromLittleEndian<quint32>(data.size));  // next chunk
+    }
+
+    // Read the "data" chunk
+    quint32 outputAudioByteArraySize = qFromLittleEndian<quint32>(data.size);
+    outputAudioByteArray.resize(outputAudioByteArraySize);
+    if (waveStream.readRawData(outputAudioByteArray.data(), outputAudioByteArraySize) != (int)outputAudioByteArraySize) {
+        qCDebug(audio) << "Error reading WAV file";
+        return 0;
+    }
+
+    _duration = (float)(outputAudioByteArraySize / (wave.sampleRate * wave.numChannels * wave.bitsPerSample / 8.0f));
+    return wave.sampleRate;
 }

libraries/auto-updater/src/AutoUpdater.h

@@ -12,8 +12,6 @@
 #ifndef hifi_AutoUpdater_h
 #define hifi_AutoUpdater_h
 
-
-#include <QtCore/QSettings>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
 #include <QtCore/QMap>

libraries/controllers/src/controllers/impl/endpoints/StandardEndpoint.h

@@ -44,7 +44,7 @@ public:
     }
 
     virtual void apply(const Pose& value, const Pointer& source) override {
-        if (value != Pose()) {
+        if (value != Pose() && value.isValid()) {
             _written = true;
         }
         VirtualEndpoint::apply(value, source);

libraries/entities/src/AnimationPropertyGroup.cpp

@@ -348,7 +348,7 @@ EntityPropertyFlags AnimationPropertyGroup::getEntityProperties(EncodeBitstreamP
 }
 
 void AnimationPropertyGroup::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
                                 EntityPropertyFlags& requestedProperties,
                                 EntityPropertyFlags& propertyFlags,
                                 EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/AnimationPropertyGroup.h

@@ -66,7 +66,7 @@ public:
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/EntityItem.cpp

@@ -148,7 +148,7 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
 }
 
 OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                            EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData) const {
+                                            EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData) const {
 
     // ALL this fits...
     //    object ID [16 bytes]

libraries/entities/src/EntityItem.h

@@ -48,6 +48,7 @@ class btCollisionShape;
 typedef std::shared_ptr<EntityTree> EntityTreePointer;
 typedef std::shared_ptr<EntityActionInterface> EntityActionPointer;
 typedef std::shared_ptr<EntityTreeElement> EntityTreeElementPointer;
+using EntityTreeElementExtraEncodeDataPointer = std::shared_ptr<EntityTreeElementExtraEncodeData>;
 
 
 namespace render {
@@ -128,10 +129,10 @@ public:
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const;
 
     virtual OctreeElement::AppendState appendEntityData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                                EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData) const;
+                                                        EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData) const;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/EntityTree.cpp

@@ -1116,10 +1116,6 @@ void EntityTree::removeNewlyCreatedHook(NewlyCreatedEntityHook* hook) {
 
 
 void EntityTree::releaseSceneEncodeData(OctreeElementExtraEncodeData* extraEncodeData) const {
-    for (auto extraData : extraEncodeData->values()) {
-        EntityTreeElementExtraEncodeData* thisExtraEncodeData = static_cast<EntityTreeElementExtraEncodeData*>(extraData);
-        delete thisExtraEncodeData;
-    }
     extraEncodeData->clear();
 }
 

libraries/entities/src/EntityTreeElement.cpp

@@ -54,9 +54,9 @@ void EntityTreeElement::debugExtraEncodeData(EncodeBitstreamParams& params) cons
     assert(extraEncodeData); // EntityTrees always require extra encode data on their encoding passes
 
     if (extraEncodeData->contains(this)) {
-        EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData
-            = static_cast<EntityTreeElementExtraEncodeData*>((*extraEncodeData)[this]);
-        qCDebug(entities) << "    encode data:" << entityTreeElementExtraEncodeData;
+        EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData
+            = std::static_pointer_cast<EntityTreeElementExtraEncodeData>((*extraEncodeData)[this]);
+        qCDebug(entities) << "    encode data:" << &(*entityTreeElementExtraEncodeData);
     } else {
         qCDebug(entities) << "    encode data: MISSING!!";
     }
@@ -68,7 +68,7 @@ void EntityTreeElement::initializeExtraEncodeData(EncodeBitstreamParams& params)
     assert(extraEncodeData); // EntityTrees always require extra encode data on their encoding passes
     // Check to see if this element yet has encode data... if it doesn't create it
     if (!extraEncodeData->contains(this)) {
-        EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData = new EntityTreeElementExtraEncodeData();
+        EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData { new EntityTreeElementExtraEncodeData() };
         entityTreeElementExtraEncodeData->elementCompleted = (_entityItems.size() == 0);
         for (int i = 0; i < NUMBER_OF_CHILDREN; i++) {
             EntityTreeElementPointer child = getChildAtIndex(i);
@@ -96,8 +96,8 @@ bool EntityTreeElement::shouldIncludeChildData(int childIndex, EncodeBitstreamPa
     assert(extraEncodeData); // EntityTrees always require extra encode data on their encoding passes
 
     if (extraEncodeData->contains(this)) {
-        EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData
-                        = static_cast<EntityTreeElementExtraEncodeData*>((*extraEncodeData)[this]);
+        EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData
+                        = std::static_pointer_cast<EntityTreeElementExtraEncodeData>((*extraEncodeData)[this]);
 
         bool childCompleted = entityTreeElementExtraEncodeData->childCompleted[childIndex];
 
@@ -125,8 +125,8 @@ bool EntityTreeElement::alreadyFullyEncoded(EncodeBitstreamParams& params) const
     assert(extraEncodeData); // EntityTrees always require extra encode data on their encoding passes
 
     if (extraEncodeData->contains(this)) {
-        EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData
-                        = static_cast<EntityTreeElementExtraEncodeData*>((*extraEncodeData)[this]);
+        EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData
+                        = std::static_pointer_cast<EntityTreeElementExtraEncodeData>((*extraEncodeData)[this]);
 
         // If we know that ALL subtrees below us have already been recursed, then we don't
         // need to recurse this child.
@@ -139,8 +139,8 @@ void EntityTreeElement::updateEncodedData(int childIndex, AppendState childAppen
     OctreeElementExtraEncodeData* extraEncodeData = params.extraEncodeData;
     assert(extraEncodeData); // EntityTrees always require extra encode data on their encoding passes
     if (extraEncodeData->contains(this)) {
-        EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData
-                        = static_cast<EntityTreeElementExtraEncodeData*>((*extraEncodeData)[this]);
+        EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData
+                        = std::static_pointer_cast<EntityTreeElementExtraEncodeData>((*extraEncodeData)[this]);
 
         if (childAppendState == OctreeElement::COMPLETED) {
             entityTreeElementExtraEncodeData->childCompleted[childIndex] = true;
@@ -164,8 +164,8 @@ void EntityTreeElement::elementEncodeComplete(EncodeBitstreamParams& params) con
     assert(extraEncodeData); // EntityTrees always require extra encode data on their encoding passes
     assert(extraEncodeData->contains(this));
 
-    EntityTreeElementExtraEncodeData* thisExtraEncodeData
-                = static_cast<EntityTreeElementExtraEncodeData*>((*extraEncodeData)[this]);
+    EntityTreeElementExtraEncodeDataPointer thisExtraEncodeData
+                = std::static_pointer_cast<EntityTreeElementExtraEncodeData>((*extraEncodeData)[this]);
 
     // Note: this will be called when OUR element has finished running through encodeTreeBitstreamRecursion()
     // which means, it's possible that our parent element hasn't finished encoding OUR data... so
@@ -188,8 +188,8 @@ void EntityTreeElement::elementEncodeComplete(EncodeBitstreamParams& params) con
             // If we've encoding this element before... but we're coming back a second time in an attempt to
             // encoud our parent... this might happen.
             if (extraEncodeData->contains(childElement.get())) {
-                EntityTreeElementExtraEncodeData* childExtraEncodeData
-                    = static_cast<EntityTreeElementExtraEncodeData*>((*extraEncodeData)[childElement.get()]);
+                EntityTreeElementExtraEncodeDataPointer childExtraEncodeData
+                    = std::static_pointer_cast<EntityTreeElementExtraEncodeData>((*extraEncodeData)[childElement.get()]);
 
                 if (wantDebug) {
                     qCDebug(entities) << "checking child: " << childElement->_cube;
@@ -237,15 +237,15 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
 
     // first, check the params.extraEncodeData to see if there's any partial re-encode data for this element
     OctreeElementExtraEncodeData* extraEncodeData = params.extraEncodeData;
-    EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData = NULL;
+    EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData = NULL;
     bool hadElementExtraData = false;
     if (extraEncodeData && extraEncodeData->contains(this)) {
         entityTreeElementExtraEncodeData =
-            static_cast<EntityTreeElementExtraEncodeData*>((*extraEncodeData)[this]);
+            std::static_pointer_cast<EntityTreeElementExtraEncodeData>((*extraEncodeData)[this]);
         hadElementExtraData = true;
     } else {
         // if there wasn't one already, then create one
-        entityTreeElementExtraEncodeData = new EntityTreeElementExtraEncodeData();
+        entityTreeElementExtraEncodeData.reset(new EntityTreeElementExtraEncodeData());
         entityTreeElementExtraEncodeData->elementCompleted = !hasContent();
 
         for (int i = 0; i < NUMBER_OF_CHILDREN; i++) {
@@ -268,7 +268,7 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
 
     //assert(extraEncodeData);
     //assert(extraEncodeData->contains(this));
-    //entityTreeElementExtraEncodeData = static_cast<EntityTreeElementExtraEncodeData*>((*extraEncodeData)[this]);
+    //entityTreeElementExtraEncodeData = std::static_pointer_cast<EntityTreeElementExtraEncodeData>((*extraEncodeData)[this]);
 
     LevelDetails elementLevel = packetData->startLevel();
 

libraries/entities/src/EntityTreeElement.h

@@ -41,7 +41,7 @@ public:
     int _movingItems;
 };
 
-class EntityTreeElementExtraEncodeData {
+class EntityTreeElementExtraEncodeData : public OctreeElementExtraEncodeDataBase {
 public:
     EntityTreeElementExtraEncodeData() :
         elementCompleted(false),
@@ -54,8 +54,9 @@ public:
     bool childCompleted[NUMBER_OF_CHILDREN];
     QMap<EntityItemID, EntityPropertyFlags> entities;
 };
+using EntityTreeElementExtraEncodeDataPointer = std::shared_ptr<EntityTreeElementExtraEncodeData>;
 
-inline QDebug operator<<(QDebug debug, const EntityTreeElementExtraEncodeData* data) {
+inline QDebug operator<<(QDebug debug, const EntityTreeElementExtraEncodeDataPointer data) {
     debug << "{";
     debug << " elementCompleted: " << data->elementCompleted << ", ";
     debug << " subtreeCompleted: " << data->subtreeCompleted << ", ";

libraries/entities/src/KeyLightPropertyGroup.cpp

@@ -186,7 +186,7 @@ EntityPropertyFlags KeyLightPropertyGroup::getEntityProperties(EncodeBitstreamPa
 }
     
 void KeyLightPropertyGroup::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, 
-                                EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
                                 EntityPropertyFlags& requestedProperties,
                                 EntityPropertyFlags& propertyFlags,
                                 EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/KeyLightPropertyGroup.h

@@ -62,7 +62,7 @@ public:
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/LightEntityItem.cpp

@@ -187,7 +187,7 @@ EntityPropertyFlags LightEntityItem::getEntityProperties(EncodeBitstreamParams&
 }
 
 void LightEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, 
-                                    EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/LightEntityItem.h

@@ -45,7 +45,7 @@ public:
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/LineEntityItem.cpp

@@ -136,7 +136,7 @@ EntityPropertyFlags LineEntityItem::getEntityProperties(EncodeBitstreamParams& p
 }
 
 void LineEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, 
-                                        EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                        EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                         EntityPropertyFlags& requestedProperties,
                                         EntityPropertyFlags& propertyFlags,
                                         EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/LineEntityItem.h

@@ -30,7 +30,7 @@ class LineEntityItem : public EntityItem {
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/ModelEntityItem.cpp

@@ -179,7 +179,7 @@ EntityPropertyFlags ModelEntityItem::getEntityProperties(EncodeBitstreamParams&
 
 
 void ModelEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
                                 EntityPropertyFlags& requestedProperties,
                                 EntityPropertyFlags& propertyFlags,
                                 EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/ModelEntityItem.h

@@ -33,7 +33,7 @@ public:
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/ParticleEffectEntityItem.cpp

@@ -508,7 +508,7 @@ EntityPropertyFlags ParticleEffectEntityItem::getEntityProperties(EncodeBitstrea
 }
 
 void ParticleEffectEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                                  EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                                  EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
                                                   EntityPropertyFlags& requestedProperties,
                                                   EntityPropertyFlags& propertyFlags,
                                                   EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/ParticleEffectEntityItem.h

@@ -32,7 +32,7 @@ public:
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/PolyLineEntityItem.cpp

@@ -183,7 +183,7 @@ EntityPropertyFlags PolyLineEntityItem::getEntityProperties(EncodeBitstreamParam
 }
 
 void PolyLineEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                            EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                            EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                             EntityPropertyFlags& requestedProperties,
                                             EntityPropertyFlags& propertyFlags,
                                             EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/PolyLineEntityItem.h

@@ -30,7 +30,7 @@ class PolyLineEntityItem : public EntityItem {
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/PolyVoxEntityItem.cpp

@@ -198,7 +198,7 @@ EntityPropertyFlags PolyVoxEntityItem::getEntityProperties(EncodeBitstreamParams
 }
 
 void PolyVoxEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                           EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                           EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                            EntityPropertyFlags& requestedProperties,
                                            EntityPropertyFlags& propertyFlags,
                                            EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/PolyVoxEntityItem.h

@@ -30,7 +30,7 @@ class PolyVoxEntityItem : public EntityItem {
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/PropertyGroup.h

@@ -22,6 +22,7 @@ class EncodeBitstreamParams;
 class OctreePacketData;
 class EntityTreeElementExtraEncodeData;
 class ReadBitstreamToTreeParams;
+using EntityTreeElementExtraEncodeDataPointer = std::shared_ptr<EntityTreeElementExtraEncodeData>;
 
 #include <OctreeElement.h>
 
@@ -84,7 +85,7 @@ public:
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const = 0;
         
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, 
-                                    EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/ShapeEntityItem.cpp

@@ -147,7 +147,7 @@ EntityPropertyFlags ShapeEntityItem::getEntityProperties(EncodeBitstreamParams&
 }
 
 void ShapeEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/ShapeEntityItem.h

@@ -56,7 +56,7 @@ public:
     EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/SkyboxPropertyGroup.cpp

@@ -121,7 +121,7 @@ EntityPropertyFlags SkyboxPropertyGroup::getEntityProperties(EncodeBitstreamPara
 }
     
 void SkyboxPropertyGroup::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, 
-                                EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
                                 EntityPropertyFlags& requestedProperties,
                                 EntityPropertyFlags& propertyFlags,
                                 EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/SkyboxPropertyGroup.h

@@ -62,7 +62,7 @@ public:
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/StagePropertyGroup.cpp

@@ -211,7 +211,7 @@ EntityPropertyFlags StagePropertyGroup::getEntityProperties(EncodeBitstreamParam
 }
     
 void StagePropertyGroup::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, 
-                                EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
                                 EntityPropertyFlags& requestedProperties,
                                 EntityPropertyFlags& propertyFlags,
                                 EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/StagePropertyGroup.h

@@ -62,7 +62,7 @@ public:
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/TextEntityItem.cpp

@@ -111,7 +111,7 @@ EntityPropertyFlags TextEntityItem::getEntityProperties(EncodeBitstreamParams& p
 }
 
 void TextEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, 
-                                    EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/TextEntityItem.h

@@ -34,7 +34,7 @@ public:
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/WebEntityItem.cpp

@@ -93,7 +93,7 @@ EntityPropertyFlags WebEntityItem::getEntityProperties(EncodeBitstreamParams& pa
 }
 
 void WebEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/WebEntityItem.h

@@ -33,7 +33,7 @@ public:
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/ZoneEntityItem.cpp

@@ -152,7 +152,7 @@ EntityPropertyFlags ZoneEntityItem::getEntityProperties(EncodeBitstreamParams& p
 }
 
 void ZoneEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, 
-                                    EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/entities/src/ZoneEntityItem.h

@@ -34,7 +34,7 @@ public:
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-                                    EntityTreeElementExtraEncodeData* modelTreeElementExtraEncodeData,
+                                    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
                                     EntityPropertyFlags& propertyFlags,
                                     EntityPropertyFlags& propertiesDidntFit,

libraries/networking/src/AddressManager.cpp

@@ -105,7 +105,7 @@ QUrl AddressManager::currentFacingShareableAddress() const {
 
 void AddressManager::loadSettings(const QString& lookupString) {
     if (lookupString.isEmpty()) {
-        handleUrl(currentAddressHandle.get().toString(), LookupTrigger::StartupFromSettings);
+        handleUrl(currentAddressHandle.get(), LookupTrigger::StartupFromSettings);
     } else {
         handleUrl(lookupString, LookupTrigger::StartupFromSettings);
     }

libraries/networking/src/udt/PacketHeaders.cpp

@@ -78,7 +78,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::MicrophoneAudioNoEcho:
         case PacketType::MicrophoneAudioWithEcho:
         case PacketType::AudioStreamStats:
-            return static_cast<PacketVersion>(AudioVersion::TerminatingStreamStats);
+            return static_cast<PacketVersion>(AudioVersion::SpaceBubbleChanges);
 
         default:
             return 17;

libraries/networking/src/udt/PacketHeaders.h

@@ -234,6 +234,7 @@ enum class AudioVersion : PacketVersion {
     CodecNameInAudioPackets,
     Exactly10msAudioPackets,
     TerminatingStreamStats,
+    SpaceBubbleChanges,
 };
 
 #endif // hifi_PacketHeaders_h

libraries/octree/src/OctreeElementBag.h

@@ -40,6 +40,11 @@ private:
     Bag _bagElements;
 };
 
-using OctreeElementExtraEncodeData = QMap<const OctreeElement*, void*>;
+class OctreeElementExtraEncodeDataBase {
+public:
+    OctreeElementExtraEncodeDataBase() {}
+};
+using OctreeElementExtraEncodeDataBasePointer = std::shared_ptr<OctreeElementExtraEncodeDataBase>;
+using OctreeElementExtraEncodeData = QMap<const OctreeElement*, OctreeElementExtraEncodeDataBasePointer>;
 
 #endif // hifi_OctreeElementBag_h

libraries/plugins/src/plugins/Forward.h

@@ -19,6 +19,7 @@ enum class PluginType {
 class DisplayPlugin;
 class InputPlugin;
 class CodecPlugin;
+class SteamClientPlugin;
 class Plugin;
 class PluginContainer;
 class PluginManager;
@@ -29,4 +30,4 @@ using InputPluginPointer = std::shared_ptr<InputPlugin>;
 using InputPluginList = std::vector<InputPluginPointer>;
 using CodecPluginPointer = std::shared_ptr<CodecPlugin>;
 using CodecPluginList = std::vector<CodecPluginPointer>;
-
+using SteamClientPluginPointer = std::shared_ptr<SteamClientPlugin>;

libraries/plugins/src/plugins/PluginManager.cpp

@@ -147,6 +147,22 @@ const CodecPluginList& PluginManager::getCodecPlugins() {
     return codecPlugins;
 }
 
+const SteamClientPluginPointer PluginManager::getSteamClientPlugin() {
+    static SteamClientPluginPointer steamClientPlugin;
+    static std::once_flag once;
+    std::call_once(once, [&] {
+        // Now grab the dynamic plugins
+        for (auto loader : getLoadedPlugins()) {
+            SteamClientProvider* steamClientProvider = qobject_cast<SteamClientProvider*>(loader->instance());
+            if (steamClientProvider) {
+                steamClientPlugin = steamClientProvider->getSteamClientPlugin();
+                break;
+            }
+        }
+    });
+    return steamClientPlugin;
+}
+
 #ifndef Q_OS_ANDROID
 
 // TODO migrate to a DLL model where plugins are discovered and loaded at runtime by the PluginManager class

libraries/plugins/src/plugins/PluginManager.h

@@ -19,6 +19,7 @@ public:
     const DisplayPluginList& getDisplayPlugins();
     const InputPluginList& getInputPlugins();
     const CodecPluginList& getCodecPlugins();
+    const SteamClientPluginPointer getSteamClientPlugin();
 
     DisplayPluginList getPreferredDisplayPlugins();
     void setPreferredDisplayPlugins(const QStringList& displays);

libraries/plugins/src/plugins/PluginUtils.cpp

@@ -51,6 +51,10 @@ bool PluginUtils::isViveControllerAvailable() {
     return isSubdeviceContainingNameAvailable("OpenVR");
 };
 
+bool PluginUtils::isOculusTouchControllerAvailable() {
+    return isSubdeviceContainingNameAvailable("OculusTouch");
+};
+
 bool PluginUtils::isXboxControllerAvailable() {
     return isSubdeviceContainingNameAvailable("X360 Controller");
 };

libraries/plugins/src/plugins/PluginUtils.h

@@ -17,5 +17,6 @@ public:
     static bool isHMDAvailable(const QString& pluginName = "");
     static bool isHandControllerAvailable();
     static bool isViveControllerAvailable();
+    static bool isOculusTouchControllerAvailable();
     static bool isXboxControllerAvailable();
 };

libraries/plugins/src/plugins/RuntimePlugin.h

@@ -45,3 +45,11 @@ public:
 #define CodecProvider_iid "com.highfidelity.plugins.codec"
 Q_DECLARE_INTERFACE(CodecProvider, CodecProvider_iid)
 
+class SteamClientProvider {
+public:
+    virtual ~SteamClientProvider() {}
+    virtual SteamClientPluginPointer getSteamClientPlugin() = 0;
+};
+
+#define SteamClientProvider_iid "com.highfidelity.plugins.steamclient"
+Q_DECLARE_INTERFACE(SteamClientProvider, SteamClientProvider_iid)

libraries/plugins/src/plugins/SteamClientPlugin.h

@@ -0,0 +1,59 @@
+//
+//  SteamClientPlugin.h
+//  libraries/plugins/src/plugins
+//
+//  Created by Clement Brisset on 12/14/16.
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+
+#ifndef hifi_SteamClientPlugin_h
+#define hifi_SteamClientPlugin_h
+
+#include <functional>
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+
+using Ticket = QByteArray;
+using TicketRequestCallback = std::function<void(Ticket)>;
+
+class SteamClientPlugin {
+public:
+    virtual ~SteamClientPlugin() {};
+
+    virtual bool init() = 0;
+    virtual void shutdown() = 0;
+
+    virtual bool isRunning() = 0;
+
+    virtual void runCallbacks() = 0;
+
+    virtual void requestTicket(TicketRequestCallback callback) = 0;
+    virtual void updateLocation(QString status, QUrl locationUrl) = 0;
+    virtual void openInviteOverlay() = 0;
+    virtual void joinLobby(QString lobbyId) = 0;
+
+    virtual int getSteamVRBuildID() = 0;
+};
+
+class SteamScriptingInterface : public QObject {
+    Q_OBJECT
+
+    Q_PROPERTY(bool isRunning READ isRunning)
+
+public:
+    SteamScriptingInterface(QObject* parent, SteamClientPlugin* plugin) : QObject(parent) {}
+
+    public slots:
+    bool isRunning() const { return _plugin->isRunning(); }
+    void openInviteOverlay() const { _plugin->openInviteOverlay(); }
+
+private:
+    SteamClientPlugin* _plugin;
+};
+
+#endif /* hifi_SteamClientPlugin_h */

libraries/render-utils/src/LightClusterGrid_shared.slh

@@ -58,7 +58,6 @@ float frustumGrid_eyeToVolumeDepth(float eposZ, float rangeNear, float rangeFar)
     return (-eposZ - rangeNear) / (rangeFar - rangeNear);
 }
 
-
 vec3 frustumGrid_eyeToVolume(vec3 epos, mat4 projection, float rangeNear, float rangeFar) {
     vec4 clipPos = vec4(epos.x * projection[0][0] + epos.z * projection[2][0],
         epos.y * projection[1][1] + epos.z * projection[2][1],
@@ -126,15 +125,11 @@ int frustumGrid_eyeDepthToClusterLayer(float eyeZ) {
 }
 
 ivec3 frustumGrid_eyeToClusterPos(vec3 eyePos) {
-    if ((eyePos.z > -frustumGrid.frustumNear) || (eyePos.z < -frustumGrid.frustumFar)) {
-        return ivec3(-2);
-    }
-    
-    if (eyePos.z > -frustumGrid.rangeNear) {
-        return ivec3(0,0,-1);
-    }
-    
-    vec3 volumePos = frustumGrid_eyeToVolume(eyePos, frustumGrid.eyeToGridProj, frustumGrid.rangeNear, frustumGrid.rangeFar);
+
+    // make sure the frontEyePos is always in the front to eval the grid pos correctly
+    vec3 frontEyePos = eyePos;
+    frontEyePos.z = (eyePos.z > 0.0f ? -eyePos.z : eyePos.z);
+    vec3 volumePos = frustumGrid_eyeToVolume(frontEyePos, frustumGrid.eyeToGridProj, frustumGrid.rangeNear, frustumGrid.rangeFar);
 
 
     vec3 gridPos = frustumGrid_volumeToGrid(volumePos, frustumGrid.dims);
@@ -143,10 +138,20 @@ ivec3 frustumGrid_eyeToClusterPos(vec3 eyePos) {
         gridPos.z = frustumGrid.dims.z;
     }
 
+    ivec3 igridPos = ivec3(floor(gridPos));
 
-    return ivec3(floor(gridPos));
+    if ((eyePos.z > -frustumGrid.frustumNear) || (eyePos.z < -frustumGrid.frustumFar)) {
+        return ivec3(igridPos.x, igridPos.y, - 2);
+    }
+
+    if (eyePos.z > -frustumGrid.rangeNear) {
+        return ivec3(igridPos.x, igridPos.y, -1);
+    }
+
+    return igridPos;
 }
 
+
 int frustumGrid_eyeToClusterDirH(vec3 eyeDir) {
     if (eyeDir.z >= 0.0f) {
         return (eyeDir.x > 0 ? frustumGrid.dims.x : -1);

libraries/render-utils/src/LightClusters.cpp

@@ -279,6 +279,7 @@ uint32_t scanLightVolumeSphere(FrustumGrid& grid, const FrustumGrid::Planes plan
 
     // FInd the light origin cluster
     auto centerCluster = grid.frustumGrid_eyeToClusterPos(glm::vec3(eyePosRadius));
+
     int center_z = centerCluster.z;
     int center_y = centerCluster.y;
 

libraries/render-utils/src/RenderForwardTask.cpp

@@ -0,0 +1,163 @@
+
+//
+//  RenderForwardTask.cpp
+//  render-utils/src/
+//
+//  Created by Zach Pomerantz on 12/13/2016.
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "RenderForwardTask.h"
+#include "RenderDeferredTask.h"
+
+#include <PerfStat.h>
+#include <PathUtils.h>
+#include <RenderArgs.h>
+#include <ViewFrustum.h>
+#include <gpu/Context.h>
+
+#include <render/CullTask.h>
+#include <render/SortTask.h>
+#include <render/DrawTask.h>
+#include <render/DrawStatus.h>
+#include <render/DrawSceneOctree.h>
+#include <render/BlurTask.h>
+
+#include "LightingModel.h"
+#include "DebugDeferredBuffer.h"
+#include "DeferredFramebuffer.h"
+#include "DeferredLightingEffect.h"
+#include "SurfaceGeometryPass.h"
+#include "FramebufferCache.h"
+#include "HitEffect.h"
+#include "TextureCache.h"
+
+#include "AmbientOcclusionEffect.h"
+#include "AntialiasingEffect.h"
+#include "ToneMappingEffect.h"
+#include "SubsurfaceScattering.h"
+
+#include <gpu/StandardShaderLib.h>
+
+#include "drawOpaqueStencil_frag.h"
+
+
+using namespace render;
+extern void initOverlay3DPipelines(render::ShapePlumber& plumber);
+extern void initDeferredPipelines(render::ShapePlumber& plumber);
+
+RenderForwardTask::RenderForwardTask(CullFunctor cullFunctor) {
+    // Prepare the ShapePipelines
+    ShapePlumberPointer shapePlumber = std::make_shared<ShapePlumber>();
+    initDeferredPipelines(*shapePlumber);
+
+    // CPU jobs:
+    // Fetch and cull the items from the scene
+    const auto spatialSelection = addJob<FetchSpatialTree>("FetchSceneSelection");
+
+    cullFunctor = cullFunctor ? cullFunctor : [](const RenderArgs*, const AABox&){ return true; };
+    auto spatialFilter = ItemFilter::Builder::visibleWorldItems().withoutLayered();
+    const auto culledSpatialSelection = addJob<CullSpatialSelection>("CullSceneSelection", spatialSelection, cullFunctor, RenderDetails::ITEM, spatialFilter);
+
+    // Overlays are not culled
+    const auto nonspatialSelection = addJob<FetchNonspatialItems>("FetchOverlaySelection");
+
+    // Multi filter visible items into different buckets
+    const int NUM_FILTERS = 3;
+    const int OPAQUE_SHAPE_BUCKET = 0;
+    const int TRANSPARENT_SHAPE_BUCKET = 1;
+    const int LIGHT_BUCKET = 2;
+    const int BACKGROUND_BUCKET = 2;
+    MultiFilterItem<NUM_FILTERS>::ItemFilterArray spatialFilters = { {
+            ItemFilter::Builder::opaqueShape(),
+            ItemFilter::Builder::transparentShape(),
+            ItemFilter::Builder::light()
+    } };
+    MultiFilterItem<NUM_FILTERS>::ItemFilterArray nonspatialFilters = { {
+            ItemFilter::Builder::opaqueShape(),
+            ItemFilter::Builder::transparentShape(),
+            ItemFilter::Builder::background()
+    } };
+    const auto filteredSpatialBuckets = addJob<MultiFilterItem<NUM_FILTERS>>("FilterSceneSelection", culledSpatialSelection, spatialFilters).get<MultiFilterItem<NUM_FILTERS>::ItemBoundsArray>();
+    const auto filteredNonspatialBuckets = addJob<MultiFilterItem<NUM_FILTERS>>("FilterOverlaySelection", nonspatialSelection, nonspatialFilters).get<MultiFilterItem<NUM_FILTERS>::ItemBoundsArray>();
+
+    // Extract / Sort opaques / Transparents / Lights / Overlays
+    const auto opaques = addJob<DepthSortItems>("DepthSortOpaque", filteredSpatialBuckets[OPAQUE_SHAPE_BUCKET]);
+    const auto transparents = addJob<DepthSortItems>("DepthSortTransparent", filteredSpatialBuckets[TRANSPARENT_SHAPE_BUCKET], DepthSortItems(false));
+    const auto lights = filteredSpatialBuckets[LIGHT_BUCKET];
+
+    const auto overlayOpaques = addJob<DepthSortItems>("DepthSortOverlayOpaque", filteredNonspatialBuckets[OPAQUE_SHAPE_BUCKET]);
+    const auto overlayTransparents = addJob<DepthSortItems>("DepthSortOverlayTransparent", filteredNonspatialBuckets[TRANSPARENT_SHAPE_BUCKET], DepthSortItems(false));
+    const auto background = filteredNonspatialBuckets[BACKGROUND_BUCKET];
+
+    const auto framebuffer = addJob<PrepareFramebuffer>("PrepareFramebuffer");
+
+    // Blit!
+    addJob<Blit>("Blit", framebuffer);
+}
+
+void RenderForwardTask::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) {
+    // sanity checks
+    assert(sceneContext);
+    if (!sceneContext->_scene) {
+        return;
+    }
+
+
+    // Is it possible that we render without a viewFrustum ?
+    if (!(renderContext->args && renderContext->args->hasViewFrustum())) {
+        return;
+    }
+
+    auto config = std::static_pointer_cast<Config>(renderContext->jobConfig);
+
+    for (auto job : _jobs) {
+        job.run(sceneContext, renderContext);
+    }
+}
+
+void PrepareFramebuffer::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, gpu::FramebufferPointer& framebuffer) {
+    auto framebufferCache = DependencyManager::get<FramebufferCache>();
+    auto framebufferSize = framebufferCache->getFrameBufferSize();
+    glm::uvec2 frameSize(framebufferSize.width(), framebufferSize.height());
+
+    // Resizing framebuffers instead of re-building them seems to cause issues with threaded rendering
+    if (_framebuffer && _framebuffer->getSize() != frameSize) {
+        _framebuffer.reset();
+    }
+
+    if (!_framebuffer) {
+        _framebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("forward"));
+
+        auto colorFormat = gpu::Element::COLOR_SRGBA_32;
+        auto defaultSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_POINT);
+        auto colorTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, frameSize.x, frameSize.y, defaultSampler));
+        _framebuffer->setRenderBuffer(0, colorTexture);
+
+        auto depthFormat = gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::DEPTH_STENCIL); // Depth24_Stencil8 texel format
+        auto depthTexture = gpu::TexturePointer(gpu::Texture::create2D(depthFormat, frameSize.x, frameSize.y, defaultSampler));
+        _framebuffer->setDepthStencilBuffer(depthTexture, depthFormat);
+    }
+
+    auto args = renderContext->args;
+    gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+        batch.enableStereo(false);
+        batch.setViewportTransform(args->_viewport);
+        batch.setStateScissorRect(args->_viewport);
+
+        batch.setFramebuffer(_framebuffer);
+        batch.clearFramebuffer(
+            gpu::Framebuffer::BUFFER_COLOR0 |
+            gpu::Framebuffer::BUFFER_COLOR1 |
+            gpu::Framebuffer::BUFFER_COLOR2 |
+            gpu::Framebuffer::BUFFER_COLOR3 |
+            gpu::Framebuffer::BUFFER_DEPTH |
+            gpu::Framebuffer::BUFFER_STENCIL,
+            vec4(vec3(0), 0), 1.0, 0.0, true);
+    });
+
+    framebuffer = _framebuffer;
+}

libraries/render-utils/src/RenderForwardTask.h

@@ -0,0 +1,42 @@
+//
+//  RenderForwardTask.h
+//  render-utils/src/
+//
+//  Created by Zach Pomerantz on 12/13/2016.
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_RenderForwardTask_h
+#define hifi_RenderForwardTask_h
+
+#include <gpu/Pipeline.h>
+#include <render/CullTask.h>
+#include "LightingModel.h"
+
+using RenderForwardTaskConfig = render::GPUTaskConfig;
+
+class RenderForwardTask : public render::Task {
+public:
+    using Config = RenderForwardTaskConfig;
+    RenderForwardTask(render::CullFunctor cullFunctor);
+
+    void configure(const Config& config) {}
+    void run(const render::SceneContextPointer& sceneContext, const render::RenderContextPointer& renderContext);
+
+    using JobModel = Model<RenderForwardTask, Config>;
+};
+
+class PrepareFramebuffer {
+public:
+    using JobModel = render::Job::ModelO<PrepareFramebuffer, gpu::FramebufferPointer>;
+
+    void run(const render::SceneContextPointer& sceneContext, const render::RenderContextPointer& renderContext, gpu::FramebufferPointer& framebuffer);
+
+private:
+    gpu::FramebufferPointer _framebuffer;
+};
+
+#endif // hifi_RenderForwardTask_h