From cfa20b6eb3e86ce72a1b37fd3b3409060740a1c5 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Mon, 8 Jan 2018 15:28:59 -0800
Subject: [PATCH 01/13] Oculus Touch: More accurate spin on thrown objects

The internal computation of angular velocity was incorrect.
Apparently, the ovrPoseStatef.AngularRotation is not in sensor frame but local to the controller rotation.

(cherry picked from commit dd0e57026e123779784102658a264f6aaeb70f67)
---
 plugins/oculus/src/OculusHelpers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp
index 3d06a4b223..4632c8ab76 100644
--- a/plugins/oculus/src/OculusHelpers.cpp
+++ b/plugins/oculus/src/OculusHelpers.cpp
@@ -262,7 +262,7 @@ controller::Pose ovrControllerPoseToHandPose(
     pose.translation = toGlm(handPose.ThePose.Position);
     pose.translation += rotation * translationOffset;
     pose.rotation = rotation * rotationOffset;
-    pose.angularVelocity = toGlm(handPose.AngularVelocity);
+    pose.angularVelocity = rotation * toGlm(handPose.AngularVelocity);
     pose.velocity = toGlm(handPose.LinearVelocity);
     pose.valid = true;
     return pose;

From 319913e6afd462d7eb1cb9bbf4edd29c3d3e9edd Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Mon, 8 Jan 2018 20:37:07 -0700
Subject: [PATCH 02/13] Fix toolbar appears on HMD mode

---
 interface/src/Application.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f3c41565f8..1cc1b6b15a 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -7357,6 +7357,7 @@ void Application::updateThreadPoolCount() const {
 }
 
 void Application::updateSystemTabletMode() {
+    if (!_settingsLoaded) return;
     qApp->setProperty(hifi::properties::HMD, isHMDMode());
     if (isHMDMode()) {
         DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());

From 9a8141076235185b0d7239682bc0525cc0498b47 Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Mon, 8 Jan 2018 20:51:15 -0700
Subject: [PATCH 03/13] refactor

---
 interface/src/Application.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 1cc1b6b15a..6cabab6c01 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -7357,12 +7357,13 @@ void Application::updateThreadPoolCount() const {
 }
 
 void Application::updateSystemTabletMode() {
-    if (!_settingsLoaded) return;
-    qApp->setProperty(hifi::properties::HMD, isHMDMode());
-    if (isHMDMode()) {
-        DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());
-    } else {
-        DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting());
+    if (_settingsLoaded) {
+        qApp->setProperty(hifi::properties::HMD, isHMDMode());
+        if (isHMDMode()) {
+            DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());
+        } else {
+            DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting());
+        }
     }
 }
 

From 125eb9ce445132f7fcf6c3159b058953cf2af2b7 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Tue, 9 Jan 2018 14:31:57 -0800
Subject: [PATCH 04/13] add new tablet model and adjust screen offset

---
 .../meshes/tablet-with-home-button.fbx        | Bin 196940 -> 198012 bytes
 .../controllers/controllerDispatcher.js       |   8 ++++----
 scripts/system/libraries/utils.js             |   2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/resources/meshes/tablet-with-home-button.fbx b/interface/resources/meshes/tablet-with-home-button.fbx
index 70b8008bad32a7288bf3b2e9a3b33a982af8be79..37247022f6431306639156fa99def798cbef41e6 100644
GIT binary patch
delta 18748
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

delta 18498
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

diff --git a/scripts/system/controllers/controllerDispatcher.js b/scripts/system/controllers/controllerDispatcher.js
index 7f2cbe0aee..16f1d086b7 100644
--- a/scripts/system/controllers/controllerDispatcher.js
+++ b/scripts/system/controllers/controllerDispatcher.js
@@ -148,8 +148,8 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
         this.setIgnorePointerItems = function() {
             if (HMD.tabletID !== this.tabletID) {
                 this.tabletID = HMD.tabletID;
-                Pointers.setIgnoreItems(_this.leftPointer, _this.blacklist.concat([HMD.tabletID]));
-                Pointers.setIgnoreItems(_this.rightPointer, _this.blacklist.concat([HMD.tabletID]));
+                Pointers.setIgnoreItems(_this.leftPointer, _this.blacklist);
+                Pointers.setIgnoreItems(_this.rightPointer, _this.blacklist);
             }
         };
 
@@ -378,8 +378,8 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
         };
 
         this.setBlacklist = function() {
-            RayPick.setIgnoreItems(_this.leftControllerRayPick, this.blacklist.concat([HMD.tabletID]));
-            RayPick.setIgnoreItems(_this.rightControllerRayPick, this.blacklist.concat([HMD.tabletID]));
+            RayPick.setIgnoreItems(_this.leftControllerRayPick, this.blacklist);
+            RayPick.setIgnoreItems(_this.rightControllerRayPick, this.blacklist);
         };
 
         var MAPPING_NAME = "com.highfidelity.controllerDispatcher";
diff --git a/scripts/system/libraries/utils.js b/scripts/system/libraries/utils.js
index a6e2751a83..bc83cc582c 100644
--- a/scripts/system/libraries/utils.js
+++ b/scripts/system/libraries/utils.js
@@ -400,7 +400,7 @@ resizeTablet = function (width, newParentJointIndex, sensorToWorldScaleOverride)
     });
 
     // update webOverlay
-    var RAYPICK_OFFSET = 0.0001; // Sufficient for raypick to reliably intersect tablet screen before tablet model.
+    var RAYPICK_OFFSET = 0.0007; // Sufficient for raypick to reliably intersect tablet screen before tablet model.
     var WEB_ENTITY_Z_OFFSET = (tabletDepth / 2.0) * sensorScaleOffsetOverride + RAYPICK_OFFSET;
     var WEB_ENTITY_Y_OFFSET = 0.004 * sensorScaleFactor * sensorScaleOffsetOverride;
     var screenWidth = 0.82 * tabletWidth;

From e54f7d5a45516f2fbd61f08de7311474b40684fb Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Wed, 10 Jan 2018 13:03:54 -0700
Subject: [PATCH 05/13] Fix Pal Master Volume overlap

---
 interface/resources/qml/hifi/NameCard.qml | 4 ++--
 interface/resources/qml/hifi/Pal.qml      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index 3f5cad655d..9993d1f2b6 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -50,7 +50,7 @@ Item {
         id: avatarImage
         visible: profileUrl !== "" && userName !== "";
         // Size
-        height: isMyCard ? 70 : 42;
+        height: isMyCard ? 84 : 42;
         width: visible ? height : 0;
         anchors.top: parent.top;
         anchors.topMargin: isMyCard ? 0 : 8;
@@ -520,7 +520,7 @@ Item {
     Slider {
         id: gainSlider
         // Size
-        width: thisNameCard.width;
+        width: thisNameCard.width - 20;
         height: 14
         // Anchors
         anchors.verticalCenter: nameCardVUMeter.verticalCenter;
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 64f61f0d69..02971cc984 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -28,7 +28,7 @@ Rectangle {
     // Properties
     property bool debug: false;
     property int myCardWidth: width - upperRightInfoContainer.width;
-    property int myCardHeight: 80;
+    property int myCardHeight: 100;
     property int rowHeight: 60;
     property int actionButtonWidth: 55;
     property int locationColumnWidth: 170;

From 250e4032b05314dd87899c471050bf2cdc20b275 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Wed, 10 Jan 2018 11:51:44 -0800
Subject: [PATCH 06/13] Bug fix to prevent wrists entering the avatar's torso.

This was inadvertently disabled in PR #11978.

(cherry picked from commit ae997928c138416744129769f9af07a40442696e)
---
 interface/src/avatar/MySkeletonModel.cpp | 16 ++++++------
 libraries/animation/src/Rig.cpp          | 31 ++++++++++++------------
 libraries/animation/src/Rig.h            | 12 ++++++---
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/interface/src/avatar/MySkeletonModel.cpp b/interface/src/avatar/MySkeletonModel.cpp
index 8d07a878b9..a8bdafb607 100644
--- a/interface/src/avatar/MySkeletonModel.cpp
+++ b/interface/src/avatar/MySkeletonModel.cpp
@@ -106,7 +106,7 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     if (avatarHeadPose.isValid()) {
         AnimPose pose(avatarHeadPose.getRotation(), avatarHeadPose.getTranslation());
         params.primaryControllerPoses[Rig::PrimaryControllerType_Head] = avatarToRigPose * pose;
-        params.primaryControllerActiveFlags[Rig::PrimaryControllerType_Head] = true;
+        params.primaryControllerFlags[Rig::PrimaryControllerType_Head] = (uint8_t)Rig::ControllerFlags::Enabled;
     } else {
         // even though full head IK is disabled, the rig still needs the head orientation to rotate the head up and
         // down in desktop mode.
@@ -114,7 +114,7 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
         // postMult 180 is necessary to convert head from -z forward to z forward.
         glm::quat headRot = Quaternions::Y_180 * head->getFinalOrientationInLocalFrame() * Quaternions::Y_180;
         params.primaryControllerPoses[Rig::PrimaryControllerType_Head] = AnimPose(glm::vec3(1.0f), headRot, glm::vec3(0.0f));
-        params.primaryControllerActiveFlags[Rig::PrimaryControllerType_Head] = false;
+        params.primaryControllerFlags[Rig::PrimaryControllerType_Head] = 0;
     }
 
     //
@@ -135,10 +135,10 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
         if (controllerPose.isValid()) {
             AnimPose pose(controllerPose.getRotation(), controllerPose.getTranslation());
             params.primaryControllerPoses[pair.second] = avatarToRigPose * pose;
-            params.primaryControllerActiveFlags[pair.second] = true;
+            params.primaryControllerFlags[pair.second] = (uint8_t)Rig::ControllerFlags::Enabled;
         } else {
             params.primaryControllerPoses[pair.second] = AnimPose::identity;
-            params.primaryControllerActiveFlags[pair.second] = false;
+            params.primaryControllerFlags[pair.second] = 0;
         }
     }
 
@@ -166,15 +166,15 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
         if (controllerPose.isValid()) {
             AnimPose pose(controllerPose.getRotation(), controllerPose.getTranslation());
             params.secondaryControllerPoses[pair.second] = avatarToRigPose * pose;
-            params.secondaryControllerActiveFlags[pair.second] = true;
+            params.secondaryControllerFlags[pair.second] = (uint8_t)Rig::ControllerFlags::Enabled;
         } else {
             params.secondaryControllerPoses[pair.second] = AnimPose::identity;
-            params.secondaryControllerActiveFlags[pair.second] = false;
+            params.secondaryControllerFlags[pair.second] = 0;
         }
     }
 
     // if hips are not under direct control, estimate the hips position.
-    if (avatarHeadPose.isValid() && !params.primaryControllerActiveFlags[Rig::PrimaryControllerType_Hips]) {
+    if (avatarHeadPose.isValid() && !(params.primaryControllerFlags[Rig::PrimaryControllerType_Hips] & (uint8_t)Rig::ControllerFlags::Enabled)) {
         bool isFlying = (myAvatar->getCharacterController()->getState() == CharacterController::State::Hover || myAvatar->getCharacterController()->computeCollisionGroup() == BULLET_COLLISION_GROUP_COLLISIONLESS);
 
         if (!_prevHipsValid) {
@@ -200,7 +200,7 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
         AnimPose sensorToRigPose(invRigMat * myAvatar->getSensorToWorldMatrix());
 
         params.primaryControllerPoses[Rig::PrimaryControllerType_Hips] = sensorToRigPose * hips;
-        params.primaryControllerActiveFlags[Rig::PrimaryControllerType_Hips] = true;
+        params.primaryControllerFlags[Rig::PrimaryControllerType_Hips] = (uint8_t)Rig::ControllerFlags::Enabled | (uint8_t)Rig::ControllerFlags::Estimated;
 
     } else {
         _prevHipsValid = false;
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index 44745c5c2d..27ba7a38a4 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -1265,7 +1265,8 @@ glm::vec3 Rig::deflectHandFromTorso(const glm::vec3& handPosition, const FBXJoin
     return position;
 }
 
-void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnabled, bool leftArmEnabled, bool rightArmEnabled, float dt,
+void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnabled, bool hipsEstimated,
+                      bool leftArmEnabled, bool rightArmEnabled, float dt,
                       const AnimPose& leftHandPose, const AnimPose& rightHandPose,
                       const FBXJointShapeInfo& hipsShapeInfo, const FBXJointShapeInfo& spineShapeInfo,
                       const FBXJointShapeInfo& spine1ShapeInfo, const FBXJointShapeInfo& spine2ShapeInfo) {
@@ -1279,7 +1280,7 @@ void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnab
         glm::vec3 handPosition = leftHandPose.trans();
         glm::quat handRotation = leftHandPose.rot();
 
-        if (!hipsEnabled) {
+        if (!hipsEnabled || hipsEstimated) {
             // prevent the hand IK targets from intersecting the torso
             handPosition = deflectHandFromTorso(handPosition, hipsShapeInfo, spineShapeInfo, spine1ShapeInfo, spine2ShapeInfo);
         }
@@ -1326,7 +1327,7 @@ void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnab
         glm::vec3 handPosition = rightHandPose.trans();
         glm::quat handRotation = rightHandPose.rot();
 
-        if (!hipsEnabled) {
+        if (!hipsEnabled || hipsEstimated) {
             // prevent the hand IK targets from intersecting the torso
             handPosition = deflectHandFromTorso(handPosition, hipsShapeInfo, spineShapeInfo, spine1ShapeInfo, spine2ShapeInfo);
         }
@@ -1550,20 +1551,20 @@ void Rig::updateFromControllerParameters(const ControllerParameters& params, flo
     _animVars.set("isTalking", params.isTalking);
     _animVars.set("notIsTalking", !params.isTalking);
 
-    bool headEnabled = params.primaryControllerActiveFlags[PrimaryControllerType_Head];
-    bool leftHandEnabled = params.primaryControllerActiveFlags[PrimaryControllerType_LeftHand];
-    bool rightHandEnabled = params.primaryControllerActiveFlags[PrimaryControllerType_RightHand];
-    bool hipsEnabled = params.primaryControllerActiveFlags[PrimaryControllerType_Hips];
-    bool leftFootEnabled = params.primaryControllerActiveFlags[PrimaryControllerType_LeftFoot];
-    bool rightFootEnabled = params.primaryControllerActiveFlags[PrimaryControllerType_RightFoot];
-    bool spine2Enabled = params.primaryControllerActiveFlags[PrimaryControllerType_Spine2];
-
-    bool leftArmEnabled = params.secondaryControllerActiveFlags[SecondaryControllerType_LeftArm];
-    bool rightArmEnabled = params.secondaryControllerActiveFlags[SecondaryControllerType_RightArm];
+    bool headEnabled = params.primaryControllerFlags[PrimaryControllerType_Head] & (uint8_t)ControllerFlags::Enabled;
+    bool leftHandEnabled = params.primaryControllerFlags[PrimaryControllerType_LeftHand] & (uint8_t)ControllerFlags::Enabled;
+    bool rightHandEnabled = params.primaryControllerFlags[PrimaryControllerType_RightHand] & (uint8_t)ControllerFlags::Enabled;
+    bool hipsEnabled = params.primaryControllerFlags[PrimaryControllerType_Hips] & (uint8_t)ControllerFlags::Enabled;
+    bool hipsEstimated = params.primaryControllerFlags[PrimaryControllerType_Hips] & (uint8_t)ControllerFlags::Estimated;
+    bool leftFootEnabled = params.primaryControllerFlags[PrimaryControllerType_LeftFoot] & (uint8_t)ControllerFlags::Enabled;
+    bool rightFootEnabled = params.primaryControllerFlags[PrimaryControllerType_RightFoot] & (uint8_t)ControllerFlags::Enabled;
+    bool spine2Enabled = params.primaryControllerFlags[PrimaryControllerType_Spine2] & (uint8_t)ControllerFlags::Enabled;
+    bool leftArmEnabled = params.secondaryControllerFlags[SecondaryControllerType_LeftArm] & (uint8_t)ControllerFlags::Enabled;
+    bool rightArmEnabled = params.secondaryControllerFlags[SecondaryControllerType_RightArm] & (uint8_t)ControllerFlags::Enabled;
 
     updateHead(headEnabled, hipsEnabled, params.primaryControllerPoses[PrimaryControllerType_Head]);
 
-    updateHands(leftHandEnabled, rightHandEnabled, hipsEnabled, leftArmEnabled, rightArmEnabled, dt,
+    updateHands(leftHandEnabled, rightHandEnabled, hipsEnabled, hipsEstimated, leftArmEnabled, rightArmEnabled, dt,
                 params.primaryControllerPoses[PrimaryControllerType_LeftHand], params.primaryControllerPoses[PrimaryControllerType_RightHand],
                 params.hipsShapeInfo, params.spineShapeInfo, params.spine1ShapeInfo, params.spine2ShapeInfo);
 
@@ -1623,7 +1624,7 @@ void Rig::updateFromControllerParameters(const ControllerParameters& params, flo
     for (int i = 0; i < (int)NumSecondaryControllerTypes; i++) {
         int index = indexOfJoint(secondaryControllerJointNames[i]);
         if (index >= 0) {
-            if (params.secondaryControllerActiveFlags[i]) {
+            if (params.secondaryControllerFlags[i] & (uint8_t)ControllerFlags::Enabled) {
                 ikNode->setSecondaryTargetInRigFrame(index, params.secondaryControllerPoses[i]);
             } else {
                 ikNode->clearSecondaryTarget(index);
diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h
index 1ec4d9527f..2b276386a0 100644
--- a/libraries/animation/src/Rig.h
+++ b/libraries/animation/src/Rig.h
@@ -69,11 +69,16 @@ public:
         NumSecondaryControllerTypes
     };
 
+    enum class ControllerFlags : uint8_t {
+        Enabled = 0x01,
+        Estimated = 0x02
+    };
+
     struct ControllerParameters {
         AnimPose primaryControllerPoses[NumPrimaryControllerTypes];  // rig space
-        bool primaryControllerActiveFlags[NumPrimaryControllerTypes];
+        uint8_t primaryControllerFlags[NumPrimaryControllerTypes];
         AnimPose secondaryControllerPoses[NumSecondaryControllerTypes];  // rig space
-        bool secondaryControllerActiveFlags[NumSecondaryControllerTypes];
+        uint8_t secondaryControllerFlags[NumSecondaryControllerTypes];
         bool isTalking;
         FBXJointShapeInfo hipsShapeInfo;
         FBXJointShapeInfo spineShapeInfo;
@@ -251,7 +256,8 @@ protected:
     void buildAbsoluteRigPoses(const AnimPoseVec& relativePoses, AnimPoseVec& absolutePosesOut);
 
     void updateHead(bool headEnabled, bool hipsEnabled, const AnimPose& headMatrix);
-    void updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnabled, bool leftArmEnabled, bool rightArmEnabled, float dt,
+    void updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnabled, bool hipsEstimated,
+                     bool leftArmEnabled, bool rightArmEnabled, float dt,
                      const AnimPose& leftHandPose, const AnimPose& rightHandPose,
                      const FBXJointShapeInfo& hipsShapeInfo, const FBXJointShapeInfo& spineShapeInfo,
                      const FBXJointShapeInfo& spine1ShapeInfo, const FBXJointShapeInfo& spine2ShapeInfo);

From 6072780d243b7e3d1e74dd77bda260a980642f78 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Wed, 10 Jan 2018 13:19:53 -0800
Subject: [PATCH 07/13] keep requesting render update until textures load

(cherry picked from commit df574c6bc94e5438a064c6420e9a108be011a12a)
---
 libraries/entities-renderer/src/RenderableModelEntityItem.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index c756070bc3..0c1721ae44 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -1080,7 +1080,7 @@ bool ModelEntityRenderer::needsRenderUpdate() const {
             return true;
         }
 
-        if (!_texturesLoaded && model->getGeometry() && model->getGeometry()->areTexturesLoaded()) {
+        if (!_texturesLoaded) {
             return true;
         }
 
@@ -1310,6 +1310,8 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
     if (!_texturesLoaded && model->getGeometry() && model->getGeometry()->areTexturesLoaded()) {
         _texturesLoaded = true;
         model->updateRenderItems();
+    } else if (!_texturesLoaded) {
+        emit requestRenderUpdate();
     }
 
     // When the individual mesh parts of a model finish fading, they will mark their Model as needing updating

From d5e3b97c934bdd1435d60373e0f7aa60659e12c6 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Wed, 10 Jan 2018 16:03:53 -0800
Subject: [PATCH 08/13] Fix for black screen when clicking Settings from Snap
 app

---
 interface/resources/qml/hifi/tablet/TabletRoot.qml | 2 +-
 scripts/system/snapshot.js                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/TabletRoot.qml b/interface/resources/qml/hifi/tablet/TabletRoot.qml
index da544c2114..e7614e11b7 100644
--- a/interface/resources/qml/hifi/tablet/TabletRoot.qml
+++ b/interface/resources/qml/hifi/tablet/TabletRoot.qml
@@ -106,7 +106,7 @@ Item {
         if (isWebPage) {
             var webUrl = tabletApps.get(currentApp).appWebUrl;
             var scriptUrl = tabletApps.get(currentApp).scriptUrl;
-            loadSource("TabletWebView.qml");
+            loadSource("hifi/tablet/TabletWebView.qml");
             loadWebUrl(webUrl, scriptUrl);
         } else {
         	loader.load(tabletApps.get(currentApp).appUrl);
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index 9afdb4ec53..dad642075f 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -121,7 +121,7 @@ function onMessage(message) {
                 || (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
                 Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "GeneralPreferencesDialog");
             } else {
-                tablet.loadQMLOnTop("TabletGeneralPreferences.qml");
+                tablet.loadQMLOnTop("hifi/tablet/TabletGeneralPreferences.qml");
             }
             break;
         case 'captureStillAndGif':

From a3ca8e3a72d5c552e85681533e41d15380d24018 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Wed, 10 Jan 2018 17:01:01 -0800
Subject: [PATCH 09/13] try to avoid reusing uniform buffer locations

(cherry picked from commit e9d751fd23f85b980aa47faf702b89292c01e20d)
---
 .../src/RenderableParticleEffectEntityItem.cpp      |  7 ++++++-
 .../src/RenderablePolyLineEntityItem.cpp            |  5 +++--
 libraries/render-utils/src/LightClusters.cpp        | 13 ++++++-------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
index bc96e45881..a3e6cd4341 100644
--- a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
@@ -23,6 +23,8 @@ using namespace render::entities;
 static uint8_t CUSTOM_PIPELINE_NUMBER = 0;
 static gpu::Stream::FormatPointer _vertexFormat;
 static std::weak_ptr<gpu::Pipeline> _texturedPipeline;
+// FIXME: This is interfering with the uniform buffers in DeferredLightingEffect.cpp, so use 11 to avoid collisions
+static int32_t PARTICLE_UNIFORM_SLOT { 11 };
 
 static ShapePipelinePointer shapePipelineFactory(const ShapePlumber& plumber, const ShapeKey& key) {
     auto texturedPipeline = _texturedPipeline.lock();
@@ -38,6 +40,9 @@ static ShapePipelinePointer shapePipelineFactory(const ShapePlumber& plumber, co
         auto fragShader = gpu::Shader::createPixel(std::string(textured_particle_frag));
 
         auto program = gpu::Shader::createProgram(vertShader, fragShader);
+        gpu::Shader::BindingSet slotBindings;
+        slotBindings.insert(gpu::Shader::Binding(std::string("particleBuffer"), PARTICLE_UNIFORM_SLOT));
+        gpu::Shader::makeProgram(*program, slotBindings);
         _texturedPipeline = texturedPipeline = gpu::Pipeline::create(program, state);
     }
 
@@ -320,7 +325,7 @@ void ParticleEffectEntityRenderer::doRender(RenderArgs* args) {
         transform.setScale(vec3(1));
     }
     batch.setModelTransform(transform);
-    batch.setUniformBuffer(0, _uniformBuffer);
+    batch.setUniformBuffer(PARTICLE_UNIFORM_SLOT, _uniformBuffer);
     batch.setInputFormat(_vertexFormat);
     batch.setInputBuffer(0, _particleBuffer, 0, sizeof(GpuParticle));
 
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index 21764dff7f..b362721cde 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -33,8 +33,9 @@ using namespace render;
 using namespace render::entities;
 
 static uint8_t CUSTOM_PIPELINE_NUMBER { 0 };
-static const int32_t PAINTSTROKE_TEXTURE_SLOT{ 0 };
-static const int32_t PAINTSTROKE_UNIFORM_SLOT{ 0 };
+static const int32_t PAINTSTROKE_TEXTURE_SLOT { 0 };
+// FIXME: This is interfering with the uniform buffers in DeferredLightingEffect.cpp, so use 11 to avoid collisions
+static const int32_t PAINTSTROKE_UNIFORM_SLOT { 11 };
 static gpu::Stream::FormatPointer polylineFormat;
 static gpu::PipelinePointer polylinePipeline;
 #ifdef POLYLINE_ENTITY_USE_FADE_EFFECT
diff --git a/libraries/render-utils/src/LightClusters.cpp b/libraries/render-utils/src/LightClusters.cpp
index eedb9053c7..d6ac7fd2e2 100644
--- a/libraries/render-utils/src/LightClusters.cpp
+++ b/libraries/render-utils/src/LightClusters.cpp
@@ -37,14 +37,13 @@ enum LightClusterGridShader_MapSlot {
 };
 
 enum LightClusterGridShader_BufferSlot {
-    LIGHT_CLUSTER_GRID_FRUSTUM_GRID_SLOT = 0,
-    DEFERRED_FRAME_TRANSFORM_BUFFER_SLOT =1,
-    CAMERA_CORRECTION_BUFFER_SLOT = 2,
+    DEFERRED_FRAME_TRANSFORM_BUFFER_SLOT = 0,
+    CAMERA_CORRECTION_BUFFER_SLOT = 1,
     LIGHT_GPU_SLOT = render::ShapePipeline::Slot::LIGHT,
-    LIGHT_INDEX_GPU_SLOT = 5,
-
-    LIGHT_CLUSTER_GRID_CLUSTER_GRID_SLOT = 6,
-    LIGHT_CLUSTER_GRID_CLUSTER_CONTENT_SLOT = 7,
+    LIGHT_INDEX_GPU_SLOT = 7,
+    LIGHT_CLUSTER_GRID_FRUSTUM_GRID_SLOT = 8,
+    LIGHT_CLUSTER_GRID_CLUSTER_GRID_SLOT = 9,
+    LIGHT_CLUSTER_GRID_CLUSTER_CONTENT_SLOT = 10,
 };
 
 FrustumGrid::FrustumGrid(const FrustumGrid& source) :

From 54a1da8d73a3179e696590b9c90c0df187d9a671 Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Thu, 11 Jan 2018 11:55:28 -0700
Subject: [PATCH 10/13] Only mod my card

---
 interface/resources/qml/hifi/NameCard.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index 9993d1f2b6..e08fdc53ff 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -520,7 +520,7 @@ Item {
     Slider {
         id: gainSlider
         // Size
-        width: thisNameCard.width - 20;
+        width: isMyCard ? thisNameCard.width - 20 : thisNameCard.width;
         height: 14
         // Anchors
         anchors.verticalCenter: nameCardVUMeter.verticalCenter;

From e627925bd3fa4f42e0fc3cc2908ef1ed6eb7af8d Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 12 Jan 2018 13:31:58 -0800
Subject: [PATCH 11/13] Fix 'Browse Avatars' button from Avatar Settings

---
 .../qml/dialogs/preferences/AvatarBrowser.qml |  85 --------------
 .../dialogs/preferences/AvatarPreference.qml  |  18 +--
 .../preferences/TabletAvatarBrowser.qml       | 111 ------------------
 interface/src/Application.cpp                 |   9 ++
 interface/src/Application.h                   |   1 +
 5 files changed, 11 insertions(+), 213 deletions(-)
 delete mode 100644 interface/resources/qml/dialogs/preferences/AvatarBrowser.qml
 delete mode 100644 interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletAvatarBrowser.qml

diff --git a/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml b/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml
deleted file mode 100644
index 5949adffca..0000000000
--- a/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-//  AvatarBrowser.qml
-//
-//  Created by Bradley Austin Davis on 30 Aug 2015
-//  Copyright 2015 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
-//
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtWebChannel 1.0
-import QtWebEngine 1.2
-
-import "../../windows"
-import "../../controls-uit"
-import "../../styles-uit"
-
-Window {
-    id: root
-    HifiConstants { id: hifi }
-    width: 900; height: 700
-    resizable: true
-    modality: Qt.ApplicationModal
-
-    Item {
-        anchors.fill: parent
-
-        property bool keyboardEnabled: false
-        property bool keyboardRaised: true
-        property bool punctuationMode: false
-
-        BaseWebView {
-            id: webview
-            url: Account.metaverseServerURL + "/marketplace?category=avatars"
-            focus: true
-
-            anchors {
-                top: parent.top
-                left: parent.left
-                right: parent.right
-                bottom: keyboard.top
-            }
-
-            // Create a global EventBridge object for raiseAndLowerKeyboard.
-            WebEngineScript {
-                id: createGlobalEventBridge
-                sourceCode: eventBridgeJavaScriptToInject
-                injectionPoint: WebEngineScript.DocumentCreation
-                worldId: WebEngineScript.MainWorld
-            }
-
-            // Detect when may want to raise and lower keyboard.
-            WebEngineScript {
-                id: raiseAndLowerKeyboard
-                injectionPoint: WebEngineScript.Deferred
-                sourceUrl: resourceDirectoryUrl + "html/raiseAndLowerKeyboard.js"
-                worldId: WebEngineScript.MainWorld
-            }
-
-            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard ]
-
-            Component.onCompleted: {
-                webChannel.registerObject("eventBridge", eventBridge);
-                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-            }
-        }
-
-        Keyboard {
-            id: keyboard
-            raised: parent.keyboardEnabled && parent.keyboardRaised
-            numeric: parent.punctuationMode
-            anchors {
-                left: parent.left
-                right: parent.right
-                bottom: parent.bottom
-            }
-        }
-
-        Component.onCompleted: {
-            keyboardEnabled = HMD.active;
-        }
-    }
-}
diff --git a/interface/resources/qml/dialogs/preferences/AvatarPreference.qml b/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
index b27827d9d7..0efc3776b3 100644
--- a/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
@@ -99,25 +99,9 @@ Preference {
                 leftMargin: dataTextField.acceptableInput ? hifi.dimensions.contentSpacing.x : 0
             }
             onClicked: {
-                if (typeof desktop !== "undefined") {
-                    // Load dialog via OffscreenUi so that JavaScript EventBridge is available.
-                    root.browser = OffscreenUi.load("dialogs/preferences/AvatarBrowser.qml");
-                    root.browser.windowDestroyed.connect(function(){
-                        root.browser = null;
-                    });
-                } else {
-                    root.browser = tabletAvatarBrowserBuilder.createObject(tabletRoot);
-
-                    // Make dialog modal.
-                    tabletRoot.openModal = root.browser;
-                }
+                ApplicationInterface.loadAvatarBrowser();
             }
         }
 
-        Component {
-            id: tabletAvatarBrowserBuilder;
-            TabletAvatarBrowser { }
-        }
-
     }
 }
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletAvatarBrowser.qml b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletAvatarBrowser.qml
deleted file mode 100644
index 2ea12f1d3d..0000000000
--- a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletAvatarBrowser.qml
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-//  TabletAvatarBrowser.qml
-//
-//  Created by David Rowe on 14 Mar 2017
-//  Copyright 2017 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
-//
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtWebChannel 1.0
-import QtWebEngine 1.2
-
-import "../../../../windows"
-import "../../../../controls-uit"
-import "../../../../styles-uit"
-
-Item {
-    id: root
-    objectName: "ModelBrowserDialog"
-
-    property string title: "Attachment Model"
-
-    property bool keyboardEnabled: false
-    property bool keyboardRaised: false
-    property bool punctuationMode: false
-
-    anchors.fill: parent
-
-    BaseWebView {
-        id: webview
-        url: (Account.metaverseServerURL + "/marketplace?category=avatars")
-        focus: true
-
-        anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-            bottom: footer.top
-        }
-
-        // Create a global EventBridge object for raiseAndLowerKeyboard.
-        WebEngineScript {
-            id: createGlobalEventBridge
-            sourceCode: eventBridgeJavaScriptToInject
-            injectionPoint: WebEngineScript.DocumentCreation
-            worldId: WebEngineScript.MainWorld
-        }
-
-        // Detect when may want to raise and lower keyboard.
-        WebEngineScript {
-            id: raiseAndLowerKeyboard
-            injectionPoint: WebEngineScript.Deferred
-            sourceUrl: resourceDirectoryUrl + "html/raiseAndLowerKeyboard.js"
-            worldId: WebEngineScript.MainWorld
-        }
-
-        userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard ]
-
-        Component.onCompleted: {
-            webChannel.registerObject("eventBridge", eventBridge);
-            webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-        }
-    }
-
-    Rectangle {
-        id: footer
-        height: 40
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: keyboard.top
-        }
-
-        color: hifi.colors.baseGray
-
-        Row {
-            anchors {
-                verticalCenter: parent.verticalCenter
-                right: parent.right
-                rightMargin: hifi.dimensions.contentMargin.x
-            }
-
-            Button {
-                text: "Cancel"
-                color: hifi.buttons.white
-                onClicked: root.destroy();
-            }
-        }
-    }
-
-    Keyboard {
-        id: keyboard
-
-        raised: parent.keyboardEnabled && parent.keyboardRaised
-        numeric: parent.punctuationMode
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-    }
-
-    Component.onCompleted: {
-        keyboardEnabled = HMD.active;
-    }
-}
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 6cabab6c01..4436c5cde9 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6776,6 +6776,15 @@ void Application::loadAddAvatarBookmarkDialog() const {
     avatarBookmarks->addBookmark();
 }
 
+void Application::loadAvatarBrowser() const {
+    auto tablet = dynamic_cast<TabletProxy*>(DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system"));
+    // construct the url to the marketplace item
+    QString url = NetworkingConstants::METAVERSE_SERVER_URL().toString() + "/marketplace?category=avatars";
+    QString MARKETPLACES_INJECT_SCRIPT_PATH = "file:///" + qApp->applicationDirPath() + "/scripts/system/html/js/marketplacesInject.js";
+    tablet->gotoWebScreen(url, MARKETPLACES_INJECT_SCRIPT_PATH);
+    DependencyManager::get<HMDScriptingInterface>()->openTablet();
+}
+
 void Application::takeSnapshot(bool notify, bool includeAnimated, float aspectRatio) {
     postLambdaEvent([notify, includeAnimated, aspectRatio, this] {
         // Get a screenshot and save it
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 479ce919a3..b687158516 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -309,6 +309,7 @@ public slots:
     void toggleEntityScriptServerLogDialog();
     Q_INVOKABLE void showAssetServerWidget(QString filePath = "");
     Q_INVOKABLE void loadAddAvatarBookmarkDialog() const;
+    Q_INVOKABLE void loadAvatarBrowser() const;
     Q_INVOKABLE SharedSoundPointer getSampleSound() const;
 
     void showDialog(const QUrl& widgetUrl, const QUrl& tabletUrl, const QString& name) const;

From a48304b1047be440dbabf033270ff15325d550b5 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Fri, 12 Jan 2018 17:06:07 -0800
Subject: [PATCH 12/13] fix Asset browser for tablet

---
 interface/src/Application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 6cabab6c01..2288bff84a 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6147,7 +6147,7 @@ void Application::showAssetServerWidget(QString filePath) {
         if (!hmd->getShouldShowTablet() && !isHMDMode()) {
             DependencyManager::get<OffscreenUi>()->show(url, "AssetServer", startUpload);
         } else {
-            static const QUrl url("hifi/dialogs/TabletAssetServer.qml");
+            static const QUrl url("../dialogs/TabletAssetServer.qml");
             tablet->pushOntoStack(url);
         }
     }

From 9d721ba605529b4acfce121eb28b1dca9491955c Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Mon, 15 Jan 2018 15:01:17 -0800
Subject: [PATCH 13/13] fix crash on last frame = first frame, make last frame
 inclusive

(cherry picked from commit f1253e3c6cdcca4c348c4a5a7e6af4560211bdf3)
---
 libraries/entities/src/ModelEntityItem.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 3e6d19f430..46c1c9a4c7 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -267,9 +267,9 @@ void ModelEntityItem::updateFrameCount() {
     if (!getAnimationHold() && getAnimationIsPlaying()) {
         float deltaTime = (float)interval / (float)USECS_PER_SECOND;
         _currentFrame += (deltaTime * getAnimationFPS());
-        if (_currentFrame > getAnimationLastFrame()) {
-            if (getAnimationLoop()) {
-                _currentFrame = getAnimationFirstFrame() + (int)(glm::floor(_currentFrame - getAnimationFirstFrame())) % (updatedFrameCount - 1);
+        if (_currentFrame > getAnimationLastFrame() + 1) {
+            if (getAnimationLoop() && getAnimationFirstFrame() != getAnimationLastFrame()) {
+                _currentFrame = getAnimationFirstFrame() + (int)(_currentFrame - getAnimationFirstFrame()) % updatedFrameCount;
             } else {
                 _currentFrame = getAnimationLastFrame();
             }