From c38ef77b2640f538359e67d0f5e67cfc20d3155e Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Fri, 22 Dec 2017 15:04:06 -0800
Subject: [PATCH 1/3] fix model overlays visibility change

---
 libraries/render-utils/src/Model.cpp | 55 ++++++++++++++++++++--------
 libraries/render-utils/src/Model.h   |  6 +--
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 7717ceda6f..6e0f97f57f 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -594,47 +594,72 @@ void Model::calculateTriangleSets() {
     }
 }
 
-void Model::setVisibleInScene(bool newValue, const render::ScenePointer& scene) {
-    if (_isVisible != newValue) {
-        _isVisible = newValue;
+void Model::setVisibleInScene(bool isVisible, const render::ScenePointer& scene) {
+    if (_isVisible != isVisible) {
+        _isVisible = isVisible;
+
+        bool isLayeredInFront = _isLayeredInFront;
+        bool isLayeredInHUD = _isLayeredInHUD;
 
         render::Transaction transaction;
         foreach (auto item, _modelMeshRenderItemsMap.keys()) {
-            transaction.resetItem(item, _modelMeshRenderItemsMap[item]);
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) {
+                data.setKey(isVisible, isLayeredInFront || isLayeredInHUD);
+            });
         }
         foreach(auto item, _collisionRenderItemsMap.keys()) {
-            transaction.resetItem(item, _collisionRenderItemsMap[item]);
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) {
+                data.setKey(isVisible, isLayeredInFront || isLayeredInHUD);
+            });
         }
         scene->enqueueTransaction(transaction);
     }
 }
 
 
-void Model::setLayeredInFront(bool layered, const render::ScenePointer& scene) {
-    if (_isLayeredInFront != layered) {
-        _isLayeredInFront = layered;
+void Model::setLayeredInFront(bool isLayeredInFront, const render::ScenePointer& scene) {
+    if (_isLayeredInFront != isLayeredInFront) {
+        _isLayeredInFront = isLayeredInFront;
+
+        bool isVisible = _isVisible;
+        bool isLayeredInHUD = _isLayeredInFront;
 
         render::Transaction transaction;
         foreach(auto item, _modelMeshRenderItemsMap.keys()) {
-            transaction.resetItem(item, _modelMeshRenderItemsMap[item]);
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) {
+                data.setKey(isVisible, isLayeredInFront || isLayeredInHUD);
+                data.setLayer(isLayeredInFront, isLayeredInHUD);
+            });
         }
         foreach(auto item, _collisionRenderItemsMap.keys()) {
-            transaction.resetItem(item, _collisionRenderItemsMap[item]);
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) {
+                data.setKey(isVisible, isLayeredInFront || isLayeredInHUD);
+                data.setLayer(isLayeredInFront, isLayeredInHUD);
+            });
         }
         scene->enqueueTransaction(transaction);
     }
 }
 
-void Model::setLayeredInHUD(bool layered, const render::ScenePointer& scene) {
-    if (_isLayeredInHUD != layered) {
-        _isLayeredInHUD = layered;
+void Model::setLayeredInHUD(bool isLayeredInHUD, const render::ScenePointer& scene) {
+    if (_isLayeredInHUD != isLayeredInHUD) {
+        _isLayeredInHUD = isLayeredInHUD;
+
+        bool isVisible = _isVisible;
+        bool isLayeredInFront = isLayeredInFront;
 
         render::Transaction transaction;
         foreach(auto item, _modelMeshRenderItemsMap.keys()) {
-            transaction.resetItem(item, _modelMeshRenderItemsMap[item]);
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) {
+                data.setKey(isVisible, isLayeredInFront || isLayeredInHUD);
+                data.setLayer(isLayeredInFront, isLayeredInHUD);
+            });
         }
         foreach(auto item, _collisionRenderItemsMap.keys()) {
-            transaction.resetItem(item, _collisionRenderItemsMap[item]);
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) {
+                data.setKey(isVisible, isLayeredInFront || isLayeredInHUD);
+                data.setLayer(isLayeredInFront, isLayeredInHUD);
+            });
         }
         scene->enqueueTransaction(transaction);
     }
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 50ccb22131..4df7faac84 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -82,9 +82,9 @@ public:
     const QUrl& getURL() const { return _url; }
 
     // new Scene/Engine rendering support
-    void setVisibleInScene(bool newValue, const render::ScenePointer& scene);
-    void setLayeredInFront(bool layered, const render::ScenePointer& scene);
-    void setLayeredInHUD(bool layered, const render::ScenePointer& scene);
+    void setVisibleInScene(bool isVisible, const render::ScenePointer& scene);
+    void setLayeredInFront(bool isLayeredInFront, const render::ScenePointer& scene);
+    void setLayeredInHUD(bool isLayeredInHUD, const render::ScenePointer& scene);
     bool needsFixupInScene() const;
 
     bool needsReload() const { return _needsReload; }

From 2898fa557e2a93fba6361638aeb82cf99e2d65b8 Mon Sep 17 00:00:00 2001
From: Sam Gondelman <samuel_gondelman@alumni.brown.edu>
Date: Sat, 23 Dec 2017 00:53:11 -0800
Subject: [PATCH 2/3] typo

---
 libraries/render-utils/src/Model.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 6e0f97f57f..b91f4dd405 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -622,7 +622,7 @@ void Model::setLayeredInFront(bool isLayeredInFront, const render::ScenePointer&
         _isLayeredInFront = isLayeredInFront;
 
         bool isVisible = _isVisible;
-        bool isLayeredInHUD = _isLayeredInFront;
+        bool isLayeredInHUD = _isLayeredInHUD;
 
         render::Transaction transaction;
         foreach(auto item, _modelMeshRenderItemsMap.keys()) {
@@ -646,7 +646,7 @@ void Model::setLayeredInHUD(bool isLayeredInHUD, const render::ScenePointer& sce
         _isLayeredInHUD = isLayeredInHUD;
 
         bool isVisible = _isVisible;
-        bool isLayeredInFront = isLayeredInFront;
+        bool isLayeredInFront = _isLayeredInFront;
 
         render::Transaction transaction;
         foreach(auto item, _modelMeshRenderItemsMap.keys()) {

From 63801ce802c71c428b7199fe71bfa35f2c85418a Mon Sep 17 00:00:00 2001
From: milad <milad@highfidelity.io>
Date: Tue, 2 Jan 2018 17:15:23 -0800
Subject: [PATCH 3/3] add .jsc, remove duplicate qmlc, and remote Utils.jsc

---
 .gitignore                           |   4 ++--
 interface/resources/qml/js/Utils.jsc | Bin 6596 -> 0 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 interface/resources/qml/js/Utils.jsc

diff --git a/.gitignore b/.gitignore
index 665238e7da..76ae194c82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@ android/.gradle
 android/app/src/main/jniLibs
 
 # VSCode
-# List taken from Github Global Ignores master@435c4d92 
+# List taken from Github Global Ignores master@435c4d92
 # https://github.com/github/gitignore/commits/master/Global/VisualStudioCode.gitignore
 .vscode/*
 !.vscode/settings.json
@@ -66,7 +66,7 @@ gvr-interface/libs/*
 # ignore files for various dev environments
 TAGS
 *.sw[po]
-*.qmlc
+*.jsc
 
 # ignore QML compilation output
 *.qmlc
diff --git a/interface/resources/qml/js/Utils.jsc b/interface/resources/qml/js/Utils.jsc
deleted file mode 100644
index ab20e996b9469915ac6a89901da175143e6b5024..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6596
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
IW4T=ZA1knw6aWAK